Revision: 1424 http://svn.sourceforge.net/geany/?rev=1424&view=rev Author: ntrel Date: 2007-03-26 05:18:51 -0700 (Mon, 26 Mar 2007)
Log Message: ----------- Load HTML-entities when the PHP lexer is first needed, instead of when typing outside of PHP styles.
Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c trunk/src/symbols.c trunk/src/symbols.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-26 12:13:04 UTC (rev 1423) +++ trunk/ChangeLog 2007-03-26 12:18:51 UTC (rev 1424) @@ -6,6 +6,9 @@ Change goto line KB to Ctrl-J (so Ctrl-L line cut Sci KB works). Remove default goto matching brace KB (doesn't work on all keyboards). + * src/sci_cb.c, src/symbols.c, src/symbols.h: + Load HTML-entities when the PHP lexer is first needed, instead of + when typing outside of PHP styles.
2007-03-25 Enrico Tröger enrico.troeger@uvena.de
Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-03-26 12:13:04 UTC (rev 1423) +++ trunk/src/sci_cb.c 2007-03-26 12:18:51 UTC (rev 1424) @@ -742,7 +742,7 @@ { // HTML entities auto completion guint i, j = 0; GString *words; - gchar **entities = symbols_get_html_entities(); + const gchar **entities = symbols_get_html_entities();
if (*root != '&' || entities == NULL) return FALSE;
Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-03-26 12:13:04 UTC (rev 1423) +++ trunk/src/symbols.c 2007-03-26 12:18:51 UTC (rev 1424) @@ -89,12 +89,16 @@
switch (file_type_idx) { + case GEANY_FILETYPES_PHP: case GEANY_FILETYPES_HTML: html_tags_loaded(); - return; + } + switch (file_type_idx) + { case GEANY_FILETYPES_CPP: symbols_global_tags_loaded(GEANY_FILETYPES_C); // load C global tags - return; // no C++ tagfile yet + // no C++ tagfile yet + return; case GEANY_FILETYPES_C: tag_type = GTF_C; break; case GEANY_FILETYPES_PASCAL:tag_type = GTF_PASCAL; break; case GEANY_FILETYPES_PHP: tag_type = GTF_PHP; break; @@ -268,12 +272,12 @@ }
-gchar **symbols_get_html_entities() +const gchar **symbols_get_html_entities() { if (html_entities == NULL) html_tags_loaded(); // if not yet created, force creation of the array but shouldn't occur
- return html_entities; + return (const gchar **) html_entities; }
Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2007-03-26 12:13:04 UTC (rev 1423) +++ trunk/src/symbols.h 2007-03-26 12:18:51 UTC (rev 1424) @@ -42,7 +42,7 @@
TMTag *symbols_find_in_workspace(const gchar *tag_name, gint type);
-gchar **symbols_get_html_entities(); +const gchar **symbols_get_html_entities();
void symbols_finalize();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.