diff options
| author | Georg Brandl <georg@python.org> | 2014-03-04 18:48:36 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-04 18:48:36 +0100 |
| commit | 87cf3e1a72b8b0c031afbff4f8effd9661bef8a3 (patch) | |
| tree | cc03c3abf23ca52db10958e244d2d1073c8d9098 | |
| parent | 31e74c08558cbcf0cdcac34803a60fbbea220e3c (diff) | |
| parent | ff32b37c05f9bae70427bc58212a45e039fa9966 (diff) | |
| download | pygments-87cf3e1a72b8b0c031afbff4f8effd9661bef8a3.tar.gz | |
merge
| -rw-r--r-- | pygments/lexers/compiled.py | 8 | ||||
| -rw-r--r-- | pygments/lexers/functional.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py index 735c5daa..2fba337d 100644 --- a/pygments/lexers/compiled.py +++ b/pygments/lexers/compiled.py @@ -3972,10 +3972,10 @@ class Inform6Lexer(RegexLexer): # Inform 7 maps these four character classes to their ASCII # equivalents. To support Inform 6 inclusions within Inform 7, # Inform6Lexer maps them too. - _dash = ur'\-\u2010-\u2014' - _dquote = ur'"\u201c\u201d' - _squote = ur"'\u2018\u2019" - _newline = ur'\n\u0085\u2028\u2029' + _dash = u'\\-\u2010-\u2014' + _dquote = u'"\u201c\u201d' + _squote = u"'\u2018\u2019" + _newline = u'\\n\u0085\u2028\u2029' tokens = { 'root': [ diff --git a/pygments/lexers/functional.py b/pygments/lexers/functional.py index 46e8ef02..ade26e97 100644 --- a/pygments/lexers/functional.py +++ b/pygments/lexers/functional.py @@ -1058,7 +1058,7 @@ class IdrisLexer(RegexLexer): (r'--(?![!#$%&*+./<=>?@\^|_~:\\]).*?$', Comment.Single), (r'{-', Comment.Multiline, 'comment'), # Identifiers - (ur'\b(%s)(?!\')\b' % '|'.join(reserved), Keyword.Reserved), + (r'\b(%s)(?!\')\b' % '|'.join(reserved), Keyword.Reserved), (r'(import|module)(\s+)', bygroups(Keyword.Reserved, Text), 'module'), (r"('')?[A-Z][\w\']*", Keyword.Type), (r'[a-z][A-Za-z0-9_\']*', Text), |