Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 09 May 2013 18:34:04 -0500
changeset 19179 12459bfa4b59
parent 19178 4327687ca757 (current diff)
parent 19169 bcdfb6078b9f (diff)
child 19181 8c2fdf7d5645
merge with stable
--- a/hgext/highlight/highlight.py	Wed May 01 10:44:21 2013 -0700
+++ b/hgext/highlight/highlight.py	Thu May 09 18:34:04 2013 -0500
@@ -38,12 +38,13 @@
 
     # To get multi-line strings right, we can't format line-by-line
     try:
-        lexer = guess_lexer_for_filename(fctx.path(), text[:1024])
+        lexer = guess_lexer_for_filename(fctx.path(), text[:1024],
+                                         stripnl=False)
     except (ClassNotFound, ValueError):
         try:
-            lexer = guess_lexer(text[:1024])
+            lexer = guess_lexer(text[:1024], stripnl=False)
         except (ClassNotFound, ValueError):
-            lexer = TextLexer()
+            lexer = TextLexer(stripnl=False)
 
     formatter = HtmlFormatter(style=style)
Mercurial