diff options
| author | Georg Brandl <georg@python.org> | 2012-08-19 10:41:29 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-08-19 10:41:29 +0200 |
| commit | b7effeecea6e64f4ed2b5c73ae325542e2115fa4 (patch) | |
| tree | 7ede6f703ea7afdc9b9c8a4bd25efdad476abf10 /pygments/lexers/_mapping.py | |
| parent | 8014741aa9e3dc21052f5d534fd2028d6489c4ee (diff) | |
| parent | ffe56f5c28cb3285f1f6a435524984e582312cdb (diff) | |
| download | pygments-b7effeecea6e64f4ed2b5c73ae325542e2115fa4.tar.gz | |
Merge with kriegaex/pygments-main (pull request #90)
Diffstat (limited to 'pygments/lexers/_mapping.py')
| -rw-r--r-- | pygments/lexers/_mapping.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py index 3f576bad..62351153 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -29,6 +29,7 @@ LEXERS = { 'AntlrRubyLexer': ('pygments.lexers.parsers', 'ANTLR With Ruby Target', ('antlr-ruby', 'antlr-rb'), ('*.G', '*.g'), ()), 'ApacheConfLexer': ('pygments.lexers.text', 'ApacheConf', ('apacheconf', 'aconf', 'apache'), ('.htaccess', 'apache.conf', 'apache2.conf'), ('text/x-apacheconf',)), 'AppleScriptLexer': ('pygments.lexers.other', 'AppleScript', ('applescript',), ('*.applescript',), ()), + 'AspectJLexer': ('pygments.lexers.jvm', 'AspectJ', ('aspectj',), ('*.aj',), ('text/x-aspectj',)), 'AsymptoteLexer': ('pygments.lexers.other', 'Asymptote', ('asy', 'asymptote'), ('*.asy',), ('text/x-asymptote',)), 'AutohotkeyLexer': ('pygments.lexers.other', 'autohotkey', ('ahk',), ('*.ahk', '*.ahkl'), ('text/x-autohotkey',)), 'AwkLexer': ('pygments.lexers.other', 'Awk', ('awk', 'gawk', 'mawk', 'nawk'), ('*.awk',), ('application/x-awk',)), @@ -137,7 +138,7 @@ LEXERS = { 'JspLexer': ('pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)), 'JuliaConsoleLexer': ('pygments.lexers.math', 'Julia console', ('jlcon',), (), ()), 'JuliaLexer': ('pygments.lexers.math', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')), - 'KconfigLexer': ('pygments.lexers.other', 'Kconfig', ('kconfig', 'kbuild', 'menuconfig', 'linux-config', 'kernel-config'), ('*Config.in*', 'external.in*', 'standard-modules.in'), ('text/x-kconfig',)), + 'KconfigLexer': ('pygments.lexers.other', 'Kconfig', ('kconfig', 'menuconfig', 'linux-config', 'kernel-config'), ('Kconfig', '*Config.in*', 'external.in*', 'standard-modules.in'), ('text/x-kconfig',)), 'KotlinLexer': ('pygments.lexers.jvm', 'Kotlin', ('kotlin',), ('*.kt',), ('text/x-kotlin',)), 'LassoCssLexer': ('pygments.lexers.templates', 'CSS+Lasso', ('css+lasso',), (), ('text/css+lasso',)), 'LassoHtmlLexer': ('pygments.lexers.templates', 'HTML+Lasso', ('html+lasso',), (), ('text/html+lasso', 'application/x-httpd-lasso', 'application/x-httpd-lasso[89]')), |