Commits

gbrandl  committed 7629817 Merge

Merge.

  • Participants
  • Parent commits 7a5a749, 515c909
  • Branches trunk

Comments (0)

Files changed (1)

File pygments/lexers/templates.py

             (r'(is)(\s+)(not)?(\s+)?([a-zA-Z_][a-zA-Z0-9_]*)',
              bygroups(Keyword, Text, Keyword, Text, Name.Function)),
             (r'(_|(?:true|false|undefined|null))\b', Keyword.Pseudo),
-            (r'(in|as|reversed|recursive|not|and|or|with|is|if|else)\b', Keyword),
+            (r'(in|as|reversed|recursive|not|and|or|is|if|else|import|'
+             r'with(?:(?:out)?\s*context)?)\b', Keyword),
             (r'(loop|block|forloop)\b', Name.Builtin),
             (r'[a-zA-Z][a-zA-Z0-9_]*', Name.Variable),
             (r'\.[a-zA-Z0-9_]+', Name.Variable),