From c8fca205deb903e8bee3114e0374297017b0b526 Mon Sep 17 00:00:00 2001
From: John Ehresman <devnull@localhost>
Date: Fri, 22 Jan 2016 09:13:16 +1100
Subject: Limit the extent of Mako line comments to finish before the line end
 characters. This prevents a later assertion failure.

---
 doc/ScintillaHistory.html | 12 ++++++++++++
 lexers/LexHTML.cxx        |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index df2c61175..1e286e8aa 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -491,6 +491,18 @@
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
+    <h3>
+       <a href="http://www.scintilla.org/scite364.zip">Release 3.6.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 18 January 2016.
+	</li>
+	<li>
+	For the HTML lexer, limit the extent of Mako line comments to finish before
+	the line end characters.
+	</li>
+    </ul>
     <h3>
        <a href="http://www.scintilla.org/scite363.zip">Release 3.6.3</a>
     </h3>
diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx
index 59c9e8ee4..43f51de6b 100644
--- a/lexers/LexHTML.cxx
+++ b/lexers/LexHTML.cxx
@@ -828,7 +828,7 @@ static void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, i
 		// handle end of Mako comment line
 		else if (isMako && makoComment && (ch == '\r' || ch == '\n')) {
 			makoComment = 0;
-			styler.ColourTo(i, StateToPrint);
+			styler.ColourTo(i - 1, StateToPrint);
 			if (scriptLanguage == eScriptPython) {
 				state = SCE_HP_DEFAULT;
 			} else {
-- 
cgit v1.2.3