SF.net SVN: geany: [673] trunk

[ntrel at users.sourceforge.net]

Revision: 673
Author:   ntrel
Date:     2006-08-05 05:33:15 -0700 (Sat, 05 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=673&view=rev

Log Message:
-----------
Fix loading Perl, TCL system config files first

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-08-05 12:25:49 UTC (rev 672)
+++ trunk/ChangeLog	2006-08-05 12:33:15 UTC (rev 673)
@@ -4,6 +4,7 @@
  * src/keyfile.c, src/filetypes.c, src/filetypes.h:
    Use unique filetype id in geany.conf to avoid new filetype problems.
    Make unique id numbers compatible with Geany 0.7 filetype order.
+ * src/highlighting.c: Fix loading Perl, TCL system config files first.
 
 
 2006-08-04  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2006-08-05 12:25:49 UTC (rev 672)
+++ trunk/src/highlighting.c	2006-08-05 12:33:15 UTC (rev 673)
@@ -1260,7 +1260,7 @@
 	gchar *f0 = g_strconcat(app->datadir, G_DIR_SEPARATOR_S "filetypes.perl", NULL);
 	gchar *f = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.perl", NULL);
 
-	styleset_load_file(config, f, G_KEY_FILE_KEEP_COMMENTS, NULL);
+	styleset_load_file(config, f0, G_KEY_FILE_KEEP_COMMENTS, NULL);
 	g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL);
 
 	types[GEANY_FILETYPES_PERL] = g_new(style_set, 1);
@@ -2230,7 +2230,7 @@
 	gchar *f0 = g_strconcat(app->datadir, G_DIR_SEPARATOR_S "filetypes.tcl", NULL);
 	gchar *f = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.tcl", NULL);
 
-	styleset_load_file(config, f, G_KEY_FILE_KEEP_COMMENTS, NULL);
+	styleset_load_file(config, f0, G_KEY_FILE_KEEP_COMMENTS, NULL);
 	g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL);
 
 	types[GEANY_FILETYPES_TCL] = g_new(style_set, 1);


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