summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2011-05-23 21:25:32 +0200
committerArmin Ronacher <armin.ronacher@active-4.com>2011-05-23 21:25:32 +0200
commitb3d5fe2abd259c2ce53c3e846f31ea3726b8ebbe (patch)
tree7e9ef844bc39912062f8ef9c37fc4f20e2f5caba
parent0c2c67d9b02222f880d47cd59f0e1e3b57d9265d (diff)
downloadpygments-b3d5fe2abd259c2ce53c3e846f31ea3726b8ebbe.tar.gz
Added changelog entry and mimetype for pypy log
-rw-r--r--CHANGES1
-rw-r--r--pygments/lexers/pypylog.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index b0ae583e..5a996e16 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ Version 1.5
* Awk
* Fancy (#633)
+ * PyPy Log
Version 1.4
diff --git a/pygments/lexers/pypylog.py b/pygments/lexers/pypylog.py
index 3944beb5..da1004a6 100644
--- a/pygments/lexers/pypylog.py
+++ b/pygments/lexers/pypylog.py
@@ -11,6 +11,7 @@ class PyPyLogLexer(RegexLexer):
name = "PyPy Log"
aliases = ["pypylog", "pypy"]
filenames = ["*.pypylog"]
+ mimetypes = ['application/x-pypylog']
tokens = {
"root": [
@@ -56,4 +57,4 @@ class PyPyLogLexer(RegexLexer):
(r"[\n\s]+", Text),
(r"#.*?$", Comment),
],
- } \ No newline at end of file
+ }