aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/LexHTML.cxx
diff options
context:
space:
mode:
authornyamatongwe <unknown>2001-07-21 02:12:36 +0000
committernyamatongwe <unknown>2001-07-21 02:12:36 +0000
commit4af7edd21563557ad52e7f2004ec46a6fe1344e4 (patch)
tree40eabccb0611b6b9767432422d7e72002294ae33 /src/LexHTML.cxx
parent657cfd8c64d012cb10e663f7a828ee64186fef4e (diff)
downloadscintilla-mirror-4af7edd21563557ad52e7f2004ec46a6fe1344e4.tar.gz
Patch from Steve to allow <? and ?> in PHP /* */ comments.
Diffstat (limited to 'src/LexHTML.cxx')
-rw-r--r--src/LexHTML.cxx4
1 files changed, 2 insertions, 2 deletions
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 == '>')) {