SF.net SVN: geany:[3828] trunk

[ntrel at users.sourceforge.net]

Revision: 3828
          http://geany.svn.sourceforge.net/geany/?rev=3828&view=rev
Author:   ntrel
Date:     2009-06-01 13:46:21 +0000 (Mon, 01 Jun 2009)

Log Message:
-----------
Support named styles also for filetypes.common [styling] entries.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-05-30 14:09:55 UTC (rev 3827)
+++ trunk/ChangeLog	2009-06-01 13:46:21 UTC (rev 3828)
@@ -1,3 +1,9 @@
+2009-06-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/highlighting.c:
+   Support named styles also for filetypes.common [styling] entries.
+
+
 2009-05-30  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * geany.spec.in:

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2009-05-30 14:09:55 UTC (rev 3827)
+++ trunk/src/highlighting.c	2009-06-01 13:46:21 UTC (rev 3828)
@@ -458,6 +458,12 @@
 		return;
 	common_style_set_valid = TRUE;	/* ensure filetypes.common is only loaded once */
 
+	/* named styles */
+	named_style_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	get_named_styles(config);
+	/* home overwrites any system named style */
+	get_named_styles(config_home);
+
 	get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &common_style_set.styling[GCS_DEFAULT]);
 	get_keyfile_hex(config, config_home, "selection", 0xc0c0c0, 0x7f0000, FALSE, &common_style_set.styling[GCS_SELECTION]);
 	get_keyfile_hex(config, config_home, "brace_good", 0x000000, 0xffffff, FALSE, &common_style_set.styling[GCS_BRACE_GOOD]);
@@ -507,12 +513,6 @@
 		(common_style_set.invert_all || interface_prefs.highlighting_invert_all);
 	get_keyfile_wordchars(config, config_home, &common_style_set.wordchars);
 	whitespace_chars = get_keyfile_whitespace_chars(config, config_home);
-
-	/* named styles */
-	named_style_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	get_named_styles(config);
-	/* home overwrites any system named style */
-	get_named_styles(config_home);
 }
 
 


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