From cde98b9de3b2f3273782b33f490dc23f8f4afa2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 5 Jul 2008 09:52:33 +0000 Subject: [PATCH] Revert the change of rev2072: Fix syntax colouring bug when using '?>' in a PHP comment (closes #1838854 and #1848518). git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2756 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 3 +++ scintilla/LexHTML.cxx | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ede3b8a8..91728a27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * doc/plugins.dox, src/editor.c, src/geanyobject.c, src/geanyobject.h, src/plugindata.h: Rename signal "populate-edit-menu" into "update-editor-menu". + * scintilla/LexHTML.cxx: + Revert the change of rev2072: Fix syntax colouring bug when using + '?>' in a PHP comment (closes #1838854 and #1848518). 2008-07-04 Nick Treleaven diff --git a/scintilla/LexHTML.cxx b/scintilla/LexHTML.cxx index 54598694..9b8d5dc9 100644 --- a/scintilla/LexHTML.cxx +++ b/scintilla/LexHTML.cxx @@ -817,7 +817,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) && ( ((scriptLanguage != eScriptNone) && stateAllowsTermination(state) && ((ch == '%') || (ch == '?'))) - ) && (chNext == '>') && (! isCommentASPState(state))) || + ) && (chNext == '>')) || ((scriptLanguage == eScriptSGML) && (ch == '>') && (state != SCE_H_SGML_COMMENT))) { if (state == SCE_H_ASPAT) { aspScript = segIsScriptingIndicator(styler,