SF.net SVN: geany:[5724] trunk

colombanw at users.sourceforge.net colombanw at xxxxx
Wed Apr 13 21:55:31 UTC 2011


Revision: 5724
          http://geany.svn.sourceforge.net/geany/?rev=5724&view=rev
Author:   colombanw
Date:     2011-04-13 21:55:31 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
Avoid triggering autocompletion on PHP open tags (closes #3199442)

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/editor.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-13 21:55:18 UTC (rev 5723)
+++ trunk/ChangeLog	2011-04-13 21:55:31 UTC (rev 5724)
@@ -1,3 +1,9 @@
+2011-04-13  Colomban Wendling  <colomban(at)geany(dot)org>
+
+ * src/editor.c:
+   Avoid triggering autocompletion on PHP open tags (closes #3199442).
+
+
 2011-04-13  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/document.c:

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2011-04-13 21:55:18 UTC (rev 5723)
+++ trunk/src/editor.c	2011-04-13 21:55:31 UTC (rev 5724)
@@ -2229,6 +2229,11 @@
 			}
 			ret = autocomplete_html(sci, root, rootlen);
 		}
+		else if (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT &&
+				 startword >= 2 && rootlen == 3 && strcmp(&root[-2], "<?php") == 0)
+		{
+			/* nothing, don't complete PHP open tags */
+		}
 		else
 		{
 			/* force is set when called by keyboard shortcut, otherwise start at the


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



More information about the Commits mailing list