diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-09-13 10:51:15 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-09-13 10:51:15 +0900 |
| commit | 0b44e68d4fed408453859dd9a83dc3ee68d90c7f (patch) | |
| tree | 6716f861446243dd10faf4d1076bd3e811a16bd7 /sphinx | |
| parent | be714fa75b2eece4fa388680b881fdc641e778e4 (diff) | |
| parent | b5dc3adf66ff70d8d6fe076954bfd0dfd13736a6 (diff) | |
| download | sphinx-git-0b44e68d4fed408453859dd9a83dc3ee68d90c7f.tar.gz | |
Merge branch '3.2.x' into 3.x
Diffstat (limited to 'sphinx')
| -rw-r--r-- | sphinx/domains/c.py | 6 | ||||
| -rw-r--r-- | sphinx/domains/cpp.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py index d8ccc2e3d..c759dacbd 100644 --- a/sphinx/domains/c.py +++ b/sphinx/domains/c.py @@ -1792,7 +1792,7 @@ class Symbol: if not declaration: if Symbol.debug_lookup: - Symbol.debug_print("no delcaration") + Symbol.debug_print("no declaration") Symbol.debug_indent -= 2 # good, just a scope creation # TODO: what if we have more than one symbol? @@ -3607,6 +3607,10 @@ class CDomain(Domain): 'macro': ObjType(_('macro'), 'macro'), 'type': ObjType(_('type'), 'type'), 'var': ObjType(_('variable'), 'data'), + 'enum': ObjType(_('enum'), 'enum'), + 'enumerator': ObjType(_('enumerator'), 'enumerator'), + 'struct': ObjType(_('struct'), 'struct'), + 'union': ObjType(_('union'), 'union'), } directives = { diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index 92d578427..7b10f8166 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -4292,7 +4292,7 @@ class Symbol: if not declaration: if Symbol.debug_lookup: - Symbol.debug_print("no delcaration") + Symbol.debug_print("no declaration") Symbol.debug_indent -= 2 # good, just a scope creation # TODO: what if we have more than one symbol? |