More housekeeping and missed additions to CHANGES.

6 files changed, 16 insertions, 12 deletions

diff --git a/CHANGES b/CHANGES
index 2fc11798..1df459ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@ Version 2.2
   * Whiley (PR#573)
   * Monte (PR#592)
   * Crystal (PR#576)
+  * Snowball (PR#589)
 
 - Added `lexers.find_lexer_class_by_name()`. (#1203)
 
@@ -44,6 +45,10 @@ Version 2.2
 
 - Improved the CSS lexer. (#1083, #1130)
 
+- Added "Rainbow Dash" style. (PR#623)
+
+- Delay loading `pkg_resources`, which takes a long while to import. (PR#690)
+
 
 Version 2.1.2
 -------------
diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py
index a683191b..31486332 100644
--- a/pygments/lexers/asm.py
+++ b/pygments/lexers/asm.py
@@ -279,7 +279,7 @@ class HsailLexer(RegexLexer):
                 'enabledetectexceptions', 'maxdynamicgroupsize', 'maxflatgridsize',
                 'maxflatworkgroupsize', 'requireddim', 'requiredgridsize',
                 'requiredworkgroupsize', 'requirenopartialworkgroups'),
-                   suffix=r'\b'), Keyword),
+                suffix=r'\b'), Keyword),
 
             # instructions
             (roundingMod, Keyword),
@@ -411,7 +411,7 @@ class LlvmLexer(RegexLexer):
                 'malloc', 'alloca', 'free', 'load', 'store', 'getelementptr',
                 'extractelement', 'insertelement', 'shufflevector', 'getresult',
                 'extractvalue', 'insertvalue', 'atomicrmw', 'cmpxchg', 'fence'),
-                   suffix=r'\b'), Keyword),
+                suffix=r'\b'), Keyword),
 
             # Types
             (words(('void', 'half', 'float', 'double', 'x86_fp80', 'fp128',
@@ -422,6 +422,7 @@ class LlvmLexer(RegexLexer):
         ]
     }
 
+
 class NasmLexer(RegexLexer):
     """
     For Nasm (Intel) assembly code.
diff --git a/pygments/lexers/clean.py b/pygments/lexers/clean.py
index bc2ae679..5c8be8d4 100644
--- a/pygments/lexers/clean.py
+++ b/pygments/lexers/clean.py
@@ -140,7 +140,7 @@ class CleanLexer(ExtendedRegexLexer):
             # Literals
             (r'\'\\?.(?<!\\)\'', String.Char),
             (r'\'\\\d+\'', String.Char),
-            (r'\'\\\\\'', String.Char), # (special case for '\\')
+            (r'\'\\\\\'', String.Char),  # (special case for '\\')
             (r'[+\-~]?\s*\d+\.\d+(E[+\-~]?\d+)?\b', Number.Float),
             (r'[+\-~]?\s*0[0-7]\b', Number.Oct),
             (r'[+\-~]?\s*0x[0-9a-fA-F]\b', Number.Hex),
diff --git a/pygments/lexers/grammar_notation.py b/pygments/lexers/grammar_notation.py
index 88641ae9..076249d3 100644
--- a/pygments/lexers/grammar_notation.py
+++ b/pygments/lexers/grammar_notation.py
@@ -13,7 +13,7 @@ import re
 
 from pygments.lexer import RegexLexer, bygroups, include, this, using, words
 from pygments.token import Comment, Keyword, Literal, Name, Number, \
-     Operator, Punctuation, String, Text
+    Operator, Punctuation, String, Text
 
 __all__ = ['BnfLexer', 'AbnfLexer', 'JsgfLexer']
 
diff --git a/pygments/lexers/typoscript.py b/pygments/lexers/typoscript.py
index e729168e..d9adb4ad 100644
--- a/pygments/lexers/typoscript.py
+++ b/pygments/lexers/typoscript.py
@@ -21,10 +21,8 @@
 import re
 
 from pygments.lexer import RegexLexer, include, bygroups, using
-from pygments.token import Keyword, Text, Comment, Name, String, Number, \
+from pygments.token import Text, Comment, Name, String, Number, \
     Operator, Punctuation
-from pygments.lexer import DelegatingLexer
-from pygments.lexers.web import HtmlLexer, CssLexer
 
 __all__ = ['TypoScriptLexer', 'TypoScriptCssDataLexer', 'TypoScriptHtmlDataLexer']
 
@@ -168,14 +166,14 @@ class TypoScriptLexer(RegexLexer):
         'whitespace': [
             (r'\s+', Text),
         ],
-        'html':[
+        'html': [
             (r'<\S[^\n>]*>', using(TypoScriptHtmlDataLexer)),
             (r'&[^;\n]*;', String),
             (r'(_CSS_DEFAULT_STYLE)(\s*)(\()(?s)(.*(?=\n\)))',
-              bygroups(Name.Class, Text, String.Symbol, using(TypoScriptCssDataLexer))),
+             bygroups(Name.Class, Text, String.Symbol, using(TypoScriptCssDataLexer))),
         ],
         'literal': [
-            (r'0x[0-9A-Fa-f]+t?',Number.Hex),
+            (r'0x[0-9A-Fa-f]+t?', Number.Hex),
             # (r'[0-9]*\.[0-9]+([eE][0-9]+)?[fd]?\s*(?:[^=])', Number.Float),
             (r'[0-9]+', Number.Integer),
             (r'(###\w+###)', Name.Constant),
diff --git a/pygments/lexers/varnish.py b/pygments/lexers/varnish.py
index 23ef1b38..44521422 100644
--- a/pygments/lexers/varnish.py
+++ b/pygments/lexers/varnish.py
@@ -121,13 +121,13 @@ class VCLLexer(RegexLexer):
              r'(\s*\(.*\))',
              bygroups(Name.Function, Punctuation, Name.Function, using(this))),
             ('[a-zA-Z_]\w*', Name),
-            ],
+        ],
         'comment': [
             (r'[^*/]+', Comment.Multiline),
             (r'/\*', Comment.Multiline, '#push'),
             (r'\*/', Comment.Multiline, '#pop'),
             (r'[*/]', Comment.Multiline),
-            ],
+        ],
         'comments': [
             (r'#.*$', Comment),
             (r'/\*', Comment.Multiline, 'comment'),