SF.net SVN: geany: [838] trunk

[eht16 at users.sourceforge.net]

Revision: 838
          http://svn.sourceforge.net/geany/?rev=838&view=rev
Author:   eht16
Date:     2006-09-27 05:48:13 -0700 (Wed, 27 Sep 2006)

Log Message:
-----------
Fixed broken autocompletion for filetype PHP.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-09-27 08:47:20 UTC (rev 837)
+++ trunk/ChangeLog	2006-09-27 12:48:13 UTC (rev 838)
@@ -1,3 +1,8 @@
+2006-09-27  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/sci_cb.c: Fixed broken autocompletion for filetype PHP.
+
+
 2006-09-26  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * win32-config.h: Enabled socket code on Windows.

Modified: trunk/src/sci_cb.c
===================================================================
--- trunk/src/sci_cb.c	2006-09-27 08:47:20 UTC (rev 837)
+++ trunk/src/sci_cb.c	2006-09-27 12:48:13 UTC (rev 838)
@@ -674,7 +674,9 @@
 	root = linebuf + startword;
 	rootlen = current - startword;
 
-	if (lexer == SCLEX_HTML)
+	// entity autocompletion always in a HTML file, in a PHP file only when we are outside of <? ?>
+	if (doc_list[idx].file_type->id == GEANY_FILETYPES_HTML ||
+		(doc_list[idx].file_type->id == GEANY_FILETYPES_PHP && (style < 118 || style > 127)))
 		ret = autocomplete_html(sci, root, rootlen);
 	else
 	{


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