diff options
| author | Georg Brandl <georg@python.org> | 2014-01-09 17:50:11 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-01-09 17:50:11 +0100 |
| commit | 495a07318b0642c1c147f1f6014c4cd109f41095 (patch) | |
| tree | d63e1174a4d42fca05e372f29d0a4f078fe7a145 /pygments/lexers/_mapping.py | |
| parent | 69193cd803d4ac6f8b2de78aefdca701841a2f24 (diff) | |
| download | pygments-495a07318b0642c1c147f1f6014c4cd109f41095.tar.gz | |
resolve alias conflict between hy and hybris
Diffstat (limited to 'pygments/lexers/_mapping.py')
| -rw-r--r-- | pygments/lexers/_mapping.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py index 0636be98..366638d7 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -136,7 +136,7 @@ LEXERS = { 'HtmlSmartyLexer': ('pygments.lexers.templates', 'HTML+Smarty', ('html+smarty',), (), ('text/html+smarty',)), 'HttpLexer': ('pygments.lexers.text', 'HTTP', ('http',), (), ()), 'HxmlLexer': ('pygments.lexers.text', 'Hxml', ('haxeml', 'hxml'), ('*.hxml',), ()), - 'HyLexer': ('pygments.lexers.agile', 'Hy', ('hy',), ('*.hy',), ('text/x-hy', 'application/x-hy')), + 'HyLexer': ('pygments.lexers.agile', 'Hy', ('hylang',), ('*.hy',), ('text/x-hy', 'application/x-hy')), 'HybrisLexer': ('pygments.lexers.other', 'Hybris', ('hybris', 'hy'), ('*.hy', '*.hyb'), ('text/x-hybris', 'application/x-hybris')), 'IDLLexer': ('pygments.lexers.math', 'IDL', ('idl',), ('*.pro',), ('text/idl',)), 'IgorLexer': ('pygments.lexers.math', 'Igor', ('igor', 'igorpro'), ('*.ipf',), ('text/ipf',)), |