diff options
| author | Tim Hatch <tim@timhatch.com> | 2014-05-15 16:58:46 -0700 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2014-05-15 16:58:46 -0700 |
| commit | 919938e38d438dbcba6ed64423fd8f7375a0f59e (patch) | |
| tree | f99125be99b3f070f6dc166ff80a38004ed72377 /pygments/lexers/templates.py | |
| parent | 583ca505dcf138b05b99ee4bee9a545dd9130356 (diff) | |
| parent | 3c8f0aed8af0456fc7834a681fe17c792c7dca1d (diff) | |
| download | pygments-919938e38d438dbcba6ed64423fd8f7375a0f59e.tar.gz | |
Merged in jaingaurav2/pygments-main (pull request #351)
Fix some lines to be within 90 characters
Diffstat (limited to 'pygments/lexers/templates.py')
| -rw-r--r-- | pygments/lexers/templates.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py index 46dac2a5..62d5da85 100644 --- a/pygments/lexers/templates.py +++ b/pygments/lexers/templates.py @@ -1536,7 +1536,7 @@ class ColdfusionMarkupLexer(RegexLexer): (r'<[^<>]*', Other), ], 'tags': [ - (r'(?s)<!---.*?--->', Comment.Multiline), + (r'<!---', Comment.Multiline, 'cfcomment'), (r'(?s)<!--.*?-->', Comment), (r'<cfoutput.*?>', Name.Builtin, 'cfoutput'), (r'(?s)(<cfscript.*?>)(.+?)(</cfscript.*?>)', @@ -1558,6 +1558,12 @@ class ColdfusionMarkupLexer(RegexLexer): (r'(?s)<[^<>]*', Other), (r'#', Other), ], + 'cfcomment': [ + (r'(?s)(.*?)(<!---)', + bygroups(Comment.Multiline, Comment.Multiline), '#push'), + (r'(?s)(.*?)(--->)', + bygroups(Comment.Multiline, Comment.Multiline), '#pop'), + ], } |