From ef7f8a349a89dd7d72d62f7a162cb3e553ca4ba6 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Sun, 27 Mar 2011 12:57:55 +1100
Subject: Fix folding failure with PHP within a line of Javascript. Bug
 #3193530.

---
 lexers/LexHTML.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lexers')

diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx
index 8e6b37434..ae4b74c7d 100644
--- a/lexers/LexHTML.cxx
+++ b/lexers/LexHTML.cxx
@@ -883,6 +883,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 		         (ch == '<') &&
 		         (chNext == '?') &&
 				 !IsScriptCommentState(state) ) {
+ 			beforeLanguage = scriptLanguage;
 			scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, eScriptPHP);
 			if (scriptLanguage != eScriptPHP && isStringState(state)) continue;
 			styler.ColourTo(i - 1, StateToPrint);
@@ -1154,7 +1155,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 			if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) {
 				levelCurrent--;
 			}
-			scriptLanguage = eScriptNone;
+			scriptLanguage = beforeLanguage;
 			continue;
 		}
 		/////////////////////////////////////
-- 
cgit v1.2.3