summaryrefslogtreecommitdiff
path: root/pygments/lexers/_mapping.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-01-09 12:08:16 +0100
committerGeorg Brandl <georg@python.org>2013-01-09 12:08:16 +0100
commitba85554e9ab6f31652cf2863fd5b79979d77e1a5 (patch)
tree8f0daccc507465f81f93b18a85dd9d7185176ffd /pygments/lexers/_mapping.py
parent170b270a30ac8d9df4c49b1a637f1a91e9b364c2 (diff)
parent0f970740661dabc7861db9e63c8e953df054ef19 (diff)
downloadpygments-ba85554e9ab6f31652cf2863fd5b79979d77e1a5.tar.gz
Merged in cmclaughlin/pygments-puppet (pull request #133: Puppet lexer)
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 c0cbeae9..a6090c75 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -208,6 +208,7 @@ LEXERS = {
'PrologLexer': ('pygments.lexers.compiled', 'Prolog', ('prolog',), ('*.prolog', '*.pro', '*.pl'), ('text/x-prolog',)),
'PropertiesLexer': ('pygments.lexers.text', 'Properties', ('properties',), ('*.properties',), ('text/x-java-properties',)),
'ProtoBufLexer': ('pygments.lexers.other', 'Protocol Buffer', ('protobuf',), ('*.proto',), ()),
+ 'PuppetLexer': ('pygments.lexers.puppet', 'Puppet', ('puppet',), ('*.pp',), ()),
'PyPyLogLexer': ('pygments.lexers.text', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
'Python3Lexer': ('pygments.lexers.agile', 'Python 3', ('python3', 'py3'), (), ('text/x-python3', 'application/x-python3')),
'Python3TracebackLexer': ('pygments.lexers.agile', 'Python 3.0 Traceback', ('py3tb',), ('*.py3tb',), ('text/x-python3-traceback',)),