SF.net SVN: geany: [2285] trunk/src/highlighting.c

[ntrel at users.sourceforge.net]

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

Log Message:
-----------
Move symbols_global_tags_loaded() out of styleset_common().

Modified Paths:
--------------
    trunk/src/highlighting.c

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2008-02-26 16:36:24 UTC (rev 2284)
+++ trunk/src/highlighting.c	2008-02-26 17:11:02 UTC (rev 2285)
@@ -387,10 +387,6 @@
 
 static void styleset_common(ScintillaObject *sci, gint style_bits, filetype_id ft_id)
 {
-	// load global tags file for autocompletion, calltips, etc.
-	if (ft_id < GEANY_FILETYPES_ALL)
-		symbols_global_tags_loaded(ft_id);
-
 	SSM(sci, SCI_STYLECLEARALL, 0, 0);
 
 	// caret colour and width
@@ -2949,8 +2945,12 @@
 
 void highlighting_set_styles(ScintillaObject *sci, gint filetype_idx)
 {
-	filetypes_load_config(filetype_idx);
+	filetypes_load_config(filetype_idx);	/* load filetypes.ext */
 
+	/* load tags files (some lexers highlight global typenames) */
+	if (filetype_idx < GEANY_FILETYPES_ALL)
+		symbols_global_tags_loaded(filetype_idx);
+
 	switch (filetype_idx)
 	{
 		styleset_case(GEANY_FILETYPES_ASM,		asm);


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