SF.net SVN: geany: [2745] trunk

[eht16 at users.sourceforge.net]

Revision: 2745
          http://geany.svn.sourceforge.net/geany/?rev=2745&view=rev
Author:   eht16
Date:     2008-07-03 06:46:01 -0700 (Thu, 03 Jul 2008)

Log Message:
-----------
Load "ignore_tags" file before generating global tags file.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-07-03 12:51:14 UTC (rev 2744)
+++ trunk/ChangeLog	2008-07-03 13:46:01 UTC (rev 2745)
@@ -6,6 +6,8 @@
  * src/keyfile.c:
    Fix broken session file support with more than 99 files
    (closes #2007288).
+ * src/symbols.c:
+   Load "ignore_tags" file before generating global tags file.
 
 
 2008-07-02  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2008-07-03 12:51:14 UTC (rev 2744)
+++ trunk/src/symbols.c	2008-07-03 13:46:01 UTC (rev 2745)
@@ -1022,6 +1022,10 @@
 			g_printerr(_("Unknown filetype extension for \"%s\".\n"), tags_file);
 			return 1;
 		}
+		/* load ignore list for C/C++ parser */
+		if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP)
+			load_c_ignore_tags();
+
 		if (want_preprocess && (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP))
 			command = g_strdup_printf("%s %s", pre_process, NVL(getenv("CFLAGS"), ""));
 		else
@@ -1033,6 +1037,7 @@
 												 (const char **) (argv + 2),
 												 argc - 2, tags_file, ft->lang);
 		g_free(command);
+		symbols_finalize(); /* free c_tags_ignore data */
 		if (! status)
 		{
 			g_printerr(_("Failed to create tags file, perhaps because no tags "


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