SF.net SVN: geany:[4756] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Fri Mar 12 15:09:48 UTC 2010


Revision: 4756
          http://geany.svn.sourceforge.net/geany/?rev=4756&view=rev
Author:   ntrel
Date:     2010-03-12 15:09:48 +0000 (Fri, 12 Mar 2010)

Log Message:
-----------
Make Long Line Marker settings for existing projects default to
general settings instead of 0 (thanks to Eugene Arshinov).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-12 14:54:18 UTC (rev 4755)
+++ trunk/ChangeLog	2010-03-12 15:09:48 UTC (rev 4756)
@@ -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>

Modified: trunk/src/project.c
===================================================================
--- trunk/src/project.c	2010-03-12 14:54:18 UTC (rev 4755)
+++ trunk/src/project.c	2010-03-12 15:09:48 UTC (rev 4756)
@@ -1019,8 +1019,10 @@
 	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);


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



More information about the Commits mailing list