diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexHTML.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 7e74594f5..e3e11c19b 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -534,6 +534,10 @@ Released 23 October 2017. </li> <li> + Fix HTML lexer handling of Django so that nesting a {{ }} or {% %} + Django tag inside of a {# #} Django comment does not break highlighting of rest of file + </li> + <li> Fix Cocoa hang when Scintilla loaded from SMB share on macOS 10.13. <a href="http://sourceforge.net/p/scintilla/bugs/1979/">Bug #1979</a>. </li> diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx index 018da1d4a..e17ba116c 100644 --- a/lexers/LexHTML.cxx +++ b/lexers/LexHTML.cxx @@ -1015,7 +1015,7 @@ static void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, i } // handle the start Django template code - else if (isDjango && scriptLanguage != eScriptPython && (ch == '{' && (chNext == '%' || chNext == '{'))) { + else if (isDjango && scriptLanguage != eScriptPython && scriptLanguage != eScriptComment && (ch == '{' && (chNext == '%' || chNext == '{'))) { if (chNext == '%') StringCopy(djangoBlockType, "%"); else |