diff options
| author | John Ehresman <devnull@localhost> | 2016-01-22 09:13:16 +1100 |
|---|---|---|
| committer | John Ehresman <devnull@localhost> | 2016-01-22 09:13:16 +1100 |
| commit | c8fca205deb903e8bee3114e0374297017b0b526 (patch) | |
| tree | 02d0e4bd94a25273f04f4564b2cb21f975871578 | |
| parent | 43291e5b336a7361cbee375136e838515a606059 (diff) | |
| download | scintilla-mirror-c8fca205deb903e8bee3114e0374297017b0b526.tar.gz | |
Limit the extent of Mako line comments to finish before the line end characters.
This prevents a later assertion failure.
| -rw-r--r-- | doc/ScintillaHistory.html | 12 | ||||
| -rw-r--r-- | lexers/LexHTML.cxx | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index df2c61175..1e286e8aa 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -492,6 +492,18 @@ </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> <ul> 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 { |