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.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2286 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2008-02-26 17:11:49 +00:00
parent d705dde953
commit 0684899905
2 changed files with 16 additions and 6 deletions

View File

@ -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:

View File

@ -103,17 +103,13 @@ static void load_c_ignore_tags(void)
}
// 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 @@ void symbols_global_tags_loaded(gint file_type_idx)
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: