diff options
| author | Georg Brandl <georg@python.org> | 2012-03-10 21:57:41 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-03-10 21:57:41 +0100 |
| commit | 2e11bb3ad2a582884aa3c5ec15f9f68be963296d (patch) | |
| tree | 5d41d1285aa466bf789e0723a07614a62bf90a9e /pygments/lexers/_mapping.py | |
| parent | 411c9dd8238982e038a355a457512b31362a1f91 (diff) | |
| parent | 88d99a8d8f2aff683998deb7f483d46ca9dd07be (diff) | |
| download | pygments-2e11bb3ad2a582884aa3c5ec15f9f68be963296d.tar.gz | |
Merged in jstrachan/pygments-main (pull request #58)
Diffstat (limited to 'pygments/lexers/_mapping.py')
| -rw-r--r-- | pygments/lexers/_mapping.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py index 76ee5b80..91161556 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -131,6 +131,7 @@ LEXERS = { 'JavascriptPhpLexer': ('pygments.lexers.templates', 'JavaScript+PHP', ('js+php', 'javascript+php'), (), ('application/x-javascript+php', 'text/x-javascript+php', 'text/javascript+php')), 'JavascriptSmartyLexer': ('pygments.lexers.templates', 'JavaScript+Smarty', ('js+smarty', 'javascript+smarty'), (), ('application/x-javascript+smarty', 'text/x-javascript+smarty', 'text/javascript+smarty')), 'JspLexer': ('pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)), + 'KotlinLexer': ('pygments.lexers.kotlin', 'Kotlin', ('kotlin',), ('*.kt',), ('application/x-kotlin',)), 'LighttpdConfLexer': ('pygments.lexers.text', 'Lighttpd configuration file', ('lighty', 'lighttpd'), (), ('text/x-lighttpd-conf',)), 'LiterateHaskellLexer': ('pygments.lexers.functional', 'Literate Haskell', ('lhs', 'literate-haskell'), ('*.lhs',), ('text/x-literate-haskell',)), 'LlvmLexer': ('pygments.lexers.asm', 'LLVM', ('llvm',), ('*.ll',), ('text/x-llvm',)), |