SF.net SVN: geany: [2286] trunk

[ntrel at users.sourceforge.net]

Revision: 2286
          http://geany.svn.sourceforge.net/geany/?rev=2286&view=rev
Author:   ntrel
Date:     2008-02-26 09:11:49 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
Load ignore.tags even when global tags loading is disabled on the
command-line, so that local tags in each open file can be ignored.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-26 17:11:02 UTC (rev 2285)
+++ trunk/ChangeLog	2008-02-26 17:11:49 UTC (rev 2286)
@@ -1,3 +1,12 @@
+2008-02-26  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/highlighting.c:
+   Move symbols_global_tags_loaded() out of styleset_common().
+ * src/symbols.c:
+   Load ignore.tags even when global tags loading is disabled on the
+   command-line, so that local tags in each open file can be ignored.
+
+
 2008-02-25  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/notebook.c:

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2008-02-26 17:11:02 UTC (rev 2285)
+++ trunk/src/symbols.c	2008-02-26 17:11:49 UTC (rev 2286)
@@ -103,17 +103,13 @@
 }
 
 
-// Ensure that the global tags file for the file_type_idx filetype is loaded.
+/* Ensure that the global tags file(s) for the file_type_idx filetype is loaded.
+ * This provides autocompletion, calltips, etc. */
 void symbols_global_tags_loaded(gint file_type_idx)
 {
 	TagFileInfo *tfi;
 	gint tag_type;
 
-	if (cl_options.ignore_global_tags || app->tm_workspace == NULL)
-		return;
-
-	load_user_tags(file_type_idx);
-
 	// load ignore list for C/C++ parser
 	if ((file_type_idx == GEANY_FILETYPES_C || file_type_idx == GEANY_FILETYPES_CPP) &&
 		c_tags_ignore == NULL)
@@ -121,6 +117,11 @@
 		load_c_ignore_tags();
 	}
 
+	if (cl_options.ignore_global_tags || app->tm_workspace == NULL)
+		return;
+
+	load_user_tags(file_type_idx);
+
 	switch (file_type_idx)
 	{
 		case GEANY_FILETYPES_PHP:


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