diff options
| author | Jharrod LaFon <jharrod.lafon@gmail.com> | 2014-04-14 14:39:50 -0400 |
|---|---|---|
| committer | Jharrod LaFon <jharrod.lafon@gmail.com> | 2014-04-14 14:39:50 -0400 |
| commit | 37b95de7fd1e562051d2ef4be04a9a39449b20ce (patch) | |
| tree | 5b8ac6b93357cbe13c0ed7378dd03d2d0d9b7da2 /pygments/lexers/_mapping.py | |
| parent | edf283a9c9a178102dac24cc7481447a25a58d8a (diff) | |
| parent | 74061ab4ddacdfd3513b8202b768e8c15dbe66fd (diff) | |
| download | pygments-37b95de7fd1e562051d2ef4be04a9a39449b20ce.tar.gz | |
Resolves merge conflict from PR#251
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 d07ed279..0bf5a947 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -278,6 +278,7 @@ LEXERS = { 'RexxLexer': ('pygments.lexers.other', 'Rexx', ('rexx', 'arexx'), ('*.rexx', '*.rex', '*.rx', '*.arexx'), ('text/x-rexx',)), 'RhtmlLexer': ('pygments.lexers.templates', 'RHTML', ('rhtml', 'html+erb', 'html+ruby'), ('*.rhtml',), ('text/html+ruby',)), 'RobotFrameworkLexer': ('pygments.lexers.other', 'RobotFramework', ('robotframework',), ('*.txt', '*.robot'), ('text/x-robotframework',)), + 'RqlLexer': ('pygments.lexers.rql', 'RQL', ('rql',), ('*.rql',), ('text/x-rql',)), 'RstLexer': ('pygments.lexers.text', 'reStructuredText', ('rst', 'rest', 'restructuredtext'), ('*.rst', '*.rest'), ('text/x-rst', 'text/prs.fallenstein.rst')), 'RubyConsoleLexer': ('pygments.lexers.agile', 'Ruby irb session', ('rbcon', 'irb'), (), ('text/x-ruby-shellsession',)), 'RubyLexer': ('pygments.lexers.agile', 'Ruby', ('rb', 'ruby', 'duby'), ('*.rb', '*.rbw', 'Rakefile', '*.rake', '*.gemspec', '*.rbx', '*.duby'), ('text/x-ruby', 'application/x-ruby')), |