From edfa892e41cd8ce2f9df4d8afb7e3c0ac2889818 Mon Sep 17 00:00:00 2001
From: Stephan Deibel <unknown>
Date: Thu, 26 Oct 2017 08:53:46 +1100
Subject: Backport: Fix nested Django tags inside a comment breaking
 highlighting of rest of file.

Backport of changeset 6408:9b831c859b2e.
---
 doc/ScintillaHistory.html | 4 ++++
 lexers/LexHTML.cxx        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 0d79d6876..ce2ada621 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -565,6 +565,10 @@
 	The Scintilla namespace is always active for internal symbols and for the lexer and document interfaces.
 	</li>
 	<li>
+	Fix HTML lexer handling of Django so that nesting a  &#123;&#123; &#125;&#125; or &#123;% %&#125;
+	Django tag inside of a &#123;# #&#125; Django comment does not break highlighting of rest of file
+	</li>
+	<li>
 	The Baan lexer checks that matches to 3rd set of keywords are function calls and leaves as identifiers if not.
 	Baan lexer and folder support #context_on / #context_off preprocessor feature.
 	</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
-- 
cgit v1.2.3