diff options
| author | Mauricio Caceres Bravo <mauricio.caceres.bravo@gmail.com> | 2019-02-12 10:27:34 -0500 |
|---|---|---|
| committer | Mauricio Caceres Bravo <mauricio.caceres.bravo@gmail.com> | 2019-02-12 10:27:34 -0500 |
| commit | 62ff49874c8a405fc24a83cb6611e8a5cf818bd5 (patch) | |
| tree | 8b33912d57eb8bedcc75f30f146608ea59f43e8a /pygments/lexers/int_fiction.py | |
| parent | df656b31ecabd8a1b649f79de050854a2974e395 (diff) | |
| parent | 77e24d5ab193f6c3fa8492f5410a2e841f9ebfad (diff) | |
| download | pygments-62ff49874c8a405fc24a83cb6611e8a5cf818bd5.tar.gz | |
Merged default branch to hopefully solve merge conflicts
Diffstat (limited to 'pygments/lexers/int_fiction.py')
| -rw-r--r-- | pygments/lexers/int_fiction.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pygments/lexers/int_fiction.py b/pygments/lexers/int_fiction.py index 724f9b27..57ace259 100644 --- a/pygments/lexers/int_fiction.py +++ b/pygments/lexers/int_fiction.py @@ -5,7 +5,7 @@ Lexers for interactive fiction languages. - :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ @@ -911,7 +911,7 @@ class Tads3Lexer(RegexLexer): 'block?/root': [ (r'\{', Punctuation, ('#pop', 'block')), include('whitespace'), - (r'(?=[[\'"<(:])', Text, # It might be a VerbRule macro. + (r'(?=[\[\'"<(:])', Text, # It might be a VerbRule macro. ('#pop', 'object-body/no-braces', 'grammar', 'grammar-rules')), # It might be a macro like DefineAction. default(('#pop', 'object-body/no-braces')) |