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
This commit is contained in:
Enrico Tröger 2008-07-05 09:52:33 +00:00
parent b14568d1f8
commit cde98b9de3
2 changed files with 4 additions and 1 deletions

View File

@ -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 <nick(dot)treleaven(at)btinternet(dot)com>

View File

@ -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,