aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexers/LexHTML.cxx
diff options
context:
space:
mode:
authorStephan Deibel <unknown>2017-10-26 08:53:46 +1100
committerStephan Deibel <unknown>2017-10-26 08:53:46 +1100
commitedfa892e41cd8ce2f9df4d8afb7e3c0ac2889818 (patch)
treed0db8e3c26d59a47da679f1b6e39c9c381ec194e /lexers/LexHTML.cxx
parent5b892e2b638de69fbd83ab5979972be6bbea0ede (diff)
downloadscintilla-mirror-edfa892e41cd8ce2f9df4d8afb7e3c0ac2889818.tar.gz
Backport: Fix nested Django tags inside a comment breaking highlighting of rest of file.
Backport of changeset 6408:9b831c859b2e.
Diffstat (limited to 'lexers/LexHTML.cxx')
-rw-r--r--lexers/LexHTML.cxx2
1 files changed, 1 insertions, 1 deletions
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