summaryrefslogtreecommitdiff
path: root/pygments
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-04-22 10:18:44 +0200
committerGeorg Brandl <georg@python.org>2014-04-22 10:18:44 +0200
commit6747ef30d28dbc52edf019e47f6edb7fb773b3db (patch)
tree78c0dcd15c6c1eca78ee8a9c87275d23b9420689 /pygments
parent67b6e64d9cfabdd6f08772428b836af6f053369f (diff)
parent524b58ffc841c5ce9de12a62a1a6082fc99eebf3 (diff)
downloadpygments-6747ef30d28dbc52edf019e47f6edb7fb773b3db.tar.gz
Merged in jaingaurav2/pygments-main-954 (pull request #323)
Added handling of escaped single quotes in Puppet files
Diffstat (limited to 'pygments')
-rw-r--r--pygments/lexers/other.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py
index 306ae326..261fa304 100644
--- a/pygments/lexers/other.py
+++ b/pygments/lexers/other.py
@@ -3392,7 +3392,7 @@ class PuppetLexer(RegexLexer):
'strings': [
(r'"([^"])*"', String),
- (r'\'([^\'])*\'', String),
+ (r"'(\\'|[^'])*'", String),
],
}