summaryrefslogtreecommitdiff
path: root/pygments/lexers/_mapping.py
diff options
context:
space:
mode:
authorRob Hoelz <rob@hoelz.ro>2013-03-20 09:20:36 +0100
committerRob Hoelz <rob@hoelz.ro>2013-03-20 09:20:36 +0100
commit6c072a3c2ff8806e3daacc13b5ab26350664c43b (patch)
treee569840b7de467787cc5a87399e1dbe2d9af3258 /pygments/lexers/_mapping.py
parent88106c79a6179a203f497d569df3c5b084a4c44e (diff)
parent9e8024c742cbdbc8a2bb975f4ee2add6b76bf20c (diff)
downloadpygments-6c072a3c2ff8806e3daacc13b5ab26350664c43b.tar.gz
Merge commits from main pygments repo
Hg: changed pygments/__init__.py
Diffstat (limited to 'pygments/lexers/_mapping.py')
-rw-r--r--pygments/lexers/_mapping.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index e36e3467..ffe4490b 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -258,6 +258,7 @@ LEXERS = {
'SchemeLexer': ('pygments.lexers.functional', 'Scheme', ('scheme', 'scm'), ('*.scm', '*.ss'), ('text/x-scheme', 'application/x-scheme')),
'ScilabLexer': ('pygments.lexers.math', 'Scilab', ('scilab',), ('*.sci', '*.sce', '*.tst'), ('text/scilab',)),
'ScssLexer': ('pygments.lexers.web', 'SCSS', ('scss',), ('*.scss',), ('text/x-scss',)),
+ 'ShellSessionLexer': ('pygments.lexers.shell', 'Shell Session', ('shell-session',), ('*.shell-session',), ('application/x-sh-session',)),
'SmaliLexer': ('pygments.lexers.dalvik', 'Smali', ('smali',), ('*.smali',), ('text/smali',)),
'SmalltalkLexer': ('pygments.lexers.other', 'Smalltalk', ('smalltalk', 'squeak'), ('*.st',), ('text/x-smalltalk',)),
'SmartyLexer': ('pygments.lexers.templates', 'Smarty', ('smarty',), ('*.tpl',), ('application/x-smarty',)),