SF.net SVN: geany: [2756] trunk

[eht16 at users.sourceforge.net]

Revision: 2756
          http://geany.svn.sourceforge.net/geany/?rev=2756&view=rev
Author:   eht16
Date:     2008-07-05 02:52:33 -0700 (Sat, 05 Jul 2008)

Log Message:
-----------
Revert the change of rev2072: Fix syntax colouring bug when using '?>' in a PHP comment (closes #1838854 and #1848518).

Revision Links:
--------------
    http://geany.svn.sourceforge.net/geany/?rev=2072&view=rev

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scintilla/LexHTML.cxx

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-07-05 09:37:37 UTC (rev 2755)
+++ trunk/ChangeLog	2008-07-05 09:52:33 UTC (rev 2756)
@@ -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>

Modified: trunk/scintilla/LexHTML.cxx
===================================================================
--- trunk/scintilla/LexHTML.cxx	2008-07-05 09:37:37 UTC (rev 2755)
+++ trunk/scintilla/LexHTML.cxx	2008-07-05 09:52:33 UTC (rev 2756)
@@ -817,7 +817,7 @@
 		             ((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,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.