summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-16 11:01:09 +0200
committerGeorg Brandl <georg@python.org>2014-10-16 11:01:09 +0200
commit435daf7051ef1a6b4b341f53afaf8bf354aac210 (patch)
tree7766f17ac38b4f9a87d8570955f69c9dd50a6e6c
parentf73424b26123a98834eb82ddf799e47e2a2a6c38 (diff)
downloadpygments-435daf7051ef1a6b4b341f53afaf8bf354aac210.tar.gz
Closes #1042: dont recognize *.md as MiniD anymore (which is now Croc).
.md should be lexed as Markdown once we have a lexer for it. Rename examplefile accordingly.
-rw-r--r--pygments/lexers/_mapping.py2
-rw-r--r--pygments/lexers/d.py2
-rw-r--r--tests/examplefiles/simple.croc (renamed from tests/examplefiles/simple.md)0
3 files changed, 2 insertions, 2 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 7c912bc9..d14c014f 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -217,7 +217,7 @@ LEXERS = {
'MathematicaLexer': ('pygments.lexers.algebra', 'Mathematica', ('mathematica', 'mma', 'nb'), ('*.nb', '*.cdf', '*.nbp', '*.ma'), ('application/mathematica', 'application/vnd.wolfram.mathematica', 'application/vnd.wolfram.mathematica.package', 'application/vnd.wolfram.cdf')),
'MatlabLexer': ('pygments.lexers.matlab', 'Matlab', ('matlab',), ('*.m',), ('text/matlab',)),
'MatlabSessionLexer': ('pygments.lexers.matlab', 'Matlab session', ('matlabsession',), (), ()),
- 'MiniDLexer': ('pygments.lexers.d', 'MiniD', ('minid',), ('*.md',), ('text/x-minidsrc',)),
+ 'MiniDLexer': ('pygments.lexers.d', 'MiniD', ('minid',), (), ('text/x-minidsrc',)),
'ModelicaLexer': ('pygments.lexers.modeling', 'Modelica', ('modelica',), ('*.mo',), ('text/x-modelica',)),
'Modula2Lexer': ('pygments.lexers.pascal', 'Modula-2', ('modula2', 'm2'), ('*.def', '*.mod'), ('text/x-modula2',)),
'MoinWikiLexer': ('pygments.lexers.markup', 'MoinMoin/Trac Wiki markup', ('trac-wiki', 'moin'), (), ('text/x-trac-wiki',)),
diff --git a/pygments/lexers/d.py b/pygments/lexers/d.py
index 3337e66a..f5d0230e 100644
--- a/pygments/lexers/d.py
+++ b/pygments/lexers/d.py
@@ -246,6 +246,6 @@ class MiniDLexer(CrocLexer):
For MiniD source. MiniD is now known as Croc.
"""
name = 'MiniD'
- filenames = ['*.md']
+ filenames = [] # don't lex .md as MiniD, reserve for Markdown
aliases = ['minid']
mimetypes = ['text/x-minidsrc']
diff --git a/tests/examplefiles/simple.md b/tests/examplefiles/simple.croc
index 8f12771a..8f12771a 100644
--- a/tests/examplefiles/simple.md
+++ b/tests/examplefiles/simple.croc