HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support named styles also for filetypes.common [styling] entries.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3828 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2009-06-01 13:46:21 +00:00
parent 11cb3f9efe
commit f678ee105a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

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

12
src/highlighting.c
View File

@ -458,6 +458,12 @@ static void styleset_common_init(gint ft_id, GKeyFile *config, GKeyFile *config_
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 @@ static void styleset_common_init(gint ft_id, GKeyFile *config, GKeyFile *config_
(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);
}