Make Long Line Marker settings for existing projects default to

general settings instead of 0 (thanks to Eugene Arshinov).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4756 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2010-03-12 15:09:48 +00:00
parent 748cc2b9d9
commit 034504dd90
2 changed files with 7 additions and 2 deletions

View File

@ -14,6 +14,9 @@
* src/dialogs.c:
Fix not destroying 'Make Custom Target' input dialog after first
use (oops).
* src/project.c:
Make Long Line Marker settings for existing projects default to
general settings instead of 0 (thanks to Eugene Arshinov).
2010-03-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

View File

@ -1019,8 +1019,10 @@ static gboolean load_config(const gchar *filename)
p->base_path = utils_get_setting_string(config, "project", "base_path", "");
p->file_patterns = g_key_file_get_string_list(config, "project", "file_patterns", NULL, NULL);
p->long_line_behaviour = g_key_file_get_integer(config, "long line marker", "long_line_behaviour", NULL);
p->long_line_column = g_key_file_get_integer(config, "long line marker", "long_line_column", NULL);
p->long_line_behaviour = utils_get_setting_integer(config, "long line marker",
"long_line_behaviour", 1 /* follow global */);
p->long_line_column = utils_get_setting_integer(config, "long line marker",
"long_line_column", editor_prefs.long_line_global_column);
apply_editor_prefs();
build_load_menu(config, GEANY_BCS_PROJ, (gpointer)p);