SF.net SVN: geany: [2072] trunk

[eht16 at users.sourceforge.net]

Revision: 2072
          http://geany.svn.sourceforge.net/geany/?rev=2072&view=rev
Author:   eht16
Date:     2007-11-27 07:18:57 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Fix syntax colouring bug when using '?>' in a PHP comment (closes #1838854).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-25 13:48:22 UTC (rev 2071)
+++ trunk/ChangeLog	2007-11-27 15:18:57 UTC (rev 2072)
@@ -1,3 +1,9 @@
+2007-11-27  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * scintilla/LexHTML.cxx: Fix syntax colouring bug when using '?>' in
+                          a PHP comment (closes #1838854).
+
+
 2007-11-25  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/document.c: Display character which caused a failed encoding

Modified: trunk/scintilla/LexHTML.cxx
===================================================================
--- trunk/scintilla/LexHTML.cxx	2007-11-25 13:48:22 UTC (rev 2071)
+++ trunk/scintilla/LexHTML.cxx	2007-11-27 15:18:57 UTC (rev 2072)
@@ -815,7 +815,7 @@
 		             ((inScriptType == eNonHtmlPreProc)
 		              || (inScriptType == eNonHtmlScriptPreProc)) && (
 		                 ((scriptLanguage != eScriptNone) && stateAllowsTermination(state) && ((ch == '%') || (ch == '?')))
-		             ) && (chNext == '>')) ||
+		             ) && (chNext == '>') && (! isCommentASPState(state))) ||
 		         ((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.