From 4af7edd21563557ad52e7f2004ec46a6fe1344e4 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Sat, 21 Jul 2001 02:12:36 +0000
Subject: Patch from Steve to allow <? and ?> in PHP /* */ comments.

---
 src/LexHTML.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/LexHTML.cxx')

diff --git a/src/LexHTML.cxx b/src/LexHTML.cxx
index a79aa4c8d..f7cd0e286 100644
--- a/src/LexHTML.cxx
+++ b/src/LexHTML.cxx
@@ -527,7 +527,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 		/////////////////////////////////////
 		// handle the start of PHP pre-processor = Non-HTML
 		else if ((state != SCE_H_ASPAT) && 
-			!isPHPStringState(state) && 
+			!isPHPStringState(state) && (state != SCE_HPHP_COMMENT) &&
 			(ch == '<') && (chNext == '?')) {
 			styler.ColourTo(i - 1, StateToPrint);
 			beforePreProc = state;
@@ -591,7 +591,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 		else if (
 			((inScriptType == eNonHtmlPreProc)
 				|| (inScriptType == eNonHtmlScriptPreProc)) && (
-				((scriptLanguage == eScriptPHP) && (ch == '?') && !isPHPStringState(state)) || 
+				((scriptLanguage == eScriptPHP) && (ch == '?') && !isPHPStringState(state) && (state != SCE_HPHP_COMMENT)) || 
 				((scriptLanguage != eScriptNone) && !isStringState(state) &&
 				 (ch == '%'))
 			) && (chNext == '>')) {
-- 
cgit v1.2.3