Fix saving non-project filetype error regex.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5170 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
parent
e9b810aeb0
commit
3e282dea44
@ -6,6 +6,8 @@
|
|||||||
* scintilla/LexMarkdown.cxx:
|
* scintilla/LexMarkdown.cxx:
|
||||||
Fix infinite loop in Markdown lexer (patch by Colomban Wendling,
|
Fix infinite loop in Markdown lexer (patch by Colomban Wendling,
|
||||||
thanks).
|
thanks).
|
||||||
|
* src/build.c:
|
||||||
|
Fix saving non-project filetype error regex.
|
||||||
|
|
||||||
|
|
||||||
2010-08-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
|
2010-08-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
|
||||||
|
@ -2569,12 +2569,12 @@ static void foreach_project_filetype(gpointer data, gpointer user_data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* TODO: untyped ptr is too ugly (also for build_load_menu) */
|
||||||
void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src)
|
void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src)
|
||||||
{
|
{
|
||||||
GeanyFiletype *ft;
|
GeanyFiletype *ft;
|
||||||
GeanyProject *pj;
|
GeanyProject *pj;
|
||||||
ForEachData data;
|
ForEachData data;
|
||||||
gchar *regkey;
|
|
||||||
|
|
||||||
switch (src)
|
switch (src)
|
||||||
{
|
{
|
||||||
@ -2584,12 +2584,10 @@ void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src)
|
|||||||
return;
|
return;
|
||||||
build_save_menu_grp(config, ft->homefilecmds, GEANY_GBG_FT, NULL);
|
build_save_menu_grp(config, ft->homefilecmds, GEANY_GBG_FT, NULL);
|
||||||
build_save_menu_grp(config, ft->homeexeccmds, GEANY_GBG_EXEC, NULL);
|
build_save_menu_grp(config, ft->homeexeccmds, GEANY_GBG_EXEC, NULL);
|
||||||
regkey = g_strdup_printf("%serror_regex", ft->name);
|
|
||||||
if (NZV(ft->homeerror_regex_string))
|
if (NZV(ft->homeerror_regex_string))
|
||||||
g_key_file_set_string(config, build_grp_name, regkey, ft->projerror_regex_string);
|
g_key_file_set_string(config, build_grp_name, "error_regex", ft->homeerror_regex_string);
|
||||||
else
|
else
|
||||||
g_key_file_remove_key(config, build_grp_name, regkey, NULL);
|
g_key_file_remove_key(config, build_grp_name, "error_regex", NULL);
|
||||||
g_free(regkey);
|
|
||||||
break;
|
break;
|
||||||
case GEANY_BCS_PREF:
|
case GEANY_BCS_PREF:
|
||||||
build_save_menu_grp(config, non_ft_pref, GEANY_GBG_NON_FT, NULL);
|
build_save_menu_grp(config, non_ft_pref, GEANY_GBG_NON_FT, NULL);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user