[geany/geany] d6d472: Rename "maintain history on reload" setting temporarily for 1.25

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 11 Jul 2015 13:44:00 UTC
Commit:      d6d4728f2e708ed275ea9a2b045a8c58c509f138
             https://github.com/geany/geany/commit/d6d4728f2e708ed275ea9a2b045a8c58c509f138

Log Message:
-----------
Rename "maintain history on reload" setting temporarily for 1.25

We want it disabled by default in 1.25 for everyone, but want to be
able to get it back on by default later on when the UI is more
polished.

So we will need to have a way to tell whether the configuration comes
from 1.25 and should be upgraded or was willfully disabled by the user
in a later version.  So, use a temporary setting name that defaults to
disabled for 1.25

See #553.


Modified Paths:
--------------
    doc/geany.txt
    src/keyfile.c

Modified: doc/geany.txt
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2652,7 +2652,7 @@ use_gio_unsafe_file_saving        Whether to use GIO as the unsafe file        t
                                   correctly on some complex setups.
 gio_unsafe_save_backup            Make a backup when using GIO unsafe file     false       immediately
                                   saving. Backup is named `filename~`.
-keep_edit_history_on_reload       Whether to maintain the edit history when    false       immediately
+keep_edit_history_on_reload_125   Whether to maintain the edit history when    false       immediately
                                   reloading a file, and allow the operation
                                   to be reverted.
 **Filetype related**


Modified: src/keyfile.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -234,7 +234,7 @@ static void init_pref_groups(void)
 	stash_group_add_boolean(group, &file_prefs.use_gio_unsafe_file_saving,
 		"use_gio_unsafe_file_saving", TRUE);
 	stash_group_add_boolean(group, &file_prefs.keep_edit_history_on_reload,
-		"keep_edit_history_on_reload", FALSE);
+		"keep_edit_history_on_reload_125", FALSE);
 	/* for backwards-compatibility */
 	stash_group_add_integer(group, &editor_prefs.indentation->hard_tab_width,
 		"indent_hard_tab_width", 8);



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).