summaryrefslogtreecommitdiff
path: root/pygments/lexers/functional.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-16 09:26:52 +0100
committerGeorg Brandl <georg@python.org>2014-03-16 09:26:52 +0100
commite9b859547feea53e1c4ad2fe9d3d694ddbee3eea (patch)
tree7295029f4c6294f42350a617f086a0048e036a7d /pygments/lexers/functional.py
parentab8518e61d744aed0dd9eae1f0ea236f986b844c (diff)
parent8de8163669a0fa659b6c48b10030cf5a73e5df61 (diff)
downloadpygments-e9b859547feea53e1c4ad2fe9d3d694ddbee3eea.tar.gz
Merged in iElectric/pygments-main (pull request #301)
Nix: add null constant and improve text highlighting
Diffstat (limited to 'pygments/lexers/functional.py')
-rw-r--r--pygments/lexers/functional.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pygments/lexers/functional.py b/pygments/lexers/functional.py
index a02abf19..55ac1937 100644
--- a/pygments/lexers/functional.py
+++ b/pygments/lexers/functional.py
@@ -996,7 +996,7 @@ class HaskellLexer(RegexLexer):
],
'character': [
# Allows multi-chars, incorrectly.
- (r"[^\\']", String.Char),
+ (r"[^\\']'", String.Char, '#pop'),
(r"\\", String.Escape, 'escape'),
("'", String.Char, '#pop'),
],