diff options
| author | Georg Brandl <georg@python.org> | 2014-03-04 15:38:16 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-04 15:38:16 +0100 |
| commit | 9e62554ada8aa1694457cb2f06d6d8379acee2d9 (patch) | |
| tree | 8b33d2d081c962e1477ec53657a937ca6889da6f | |
| parent | ec64412d1d27cfee2f7af0a03c3281d9735739e0 (diff) | |
| download | pygments-9e62554ada8aa1694457cb2f06d6d8379acee2d9.tar.gz | |
Fix duplicate mimetype.
| -rw-r--r-- | pygments/lexers/_mapping.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/asm.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py index 0cd981f3..68ca5fd6 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -211,7 +211,7 @@ LEXERS = { 'MyghtyXmlLexer': ('pygments.lexers.templates', 'XML+Myghty', ('xml+myghty',), (), ('application/xml+myghty',)), 'NSISLexer': ('pygments.lexers.other', 'NSIS', ('nsis', 'nsi', 'nsh'), ('*.nsi', '*.nsh'), ('text/x-nsis',)), 'NasmLexer': ('pygments.lexers.asm', 'NASM', ('nasm',), ('*.asm', '*.ASM'), ('text/x-nasm',)), - 'NasmObjdumpLexer': ('pygments.lexers.asm', 'objdump-nasm', ('objdump-nasm',), ('*.objdump-intel',), ('text/x-objdump',)), + 'NasmObjdumpLexer': ('pygments.lexers.asm', 'objdump-nasm', ('objdump-nasm',), ('*.objdump-intel',), ('text/x-nasm-objdump',)), 'NemerleLexer': ('pygments.lexers.dotnet', 'Nemerle', ('nemerle',), ('*.n',), ('text/x-nemerle',)), 'NesCLexer': ('pygments.lexers.compiled', 'nesC', ('nesc',), ('*.nc',), ('text/x-nescsrc',)), 'NewLispLexer': ('pygments.lexers.functional', 'NewLisp', ('newlisp',), ('*.lsp', '*.nl'), ('text/x-newlisp', 'application/x-newlisp')), diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py index 5af0585b..2727a55d 100644 --- a/pygments/lexers/asm.py +++ b/pygments/lexers/asm.py @@ -391,6 +391,7 @@ class NasmObjdumpLexer(ObjdumpLexer): name = 'objdump-nasm' aliases = ['objdump-nasm'] filenames = ['*.objdump-intel'] + mimetypes = ['text/x-nasm-objdump'] tokens = _objdump_lexer_tokens(NasmLexer) |