[geany/geany] 676f37: Merge pull request #553 from b4n/no-reload-maintain-history-by-default

Colomban Wendling git-noreply at xxxxx
Sat Jul 11 20:34:41 UTC 2015


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 11 Jul 2015 20:34:41 UTC
Commit:      676f3794fcae6068da770eecc1570c5868bd8a44
             https://github.com/geany/geany/commit/676f3794fcae6068da770eecc1570c5868bd8a44

Log Message:
-----------
Merge pull request #553 from b4n/no-reload-maintain-history-by-default

Disable "maintain history on reload" by default


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

Modified: NEWS
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -59,8 +59,8 @@ Geany 1.25 (unreleased)
     * Do not comment out blank lines when toggling comments (PR#79, Igor
       Shaula).
     * Improve handling of Verilog strings and comments.
-    * Keep undo history when reloading files (PR#188, Arthur
-      Rosenstein).
+    * Support for keeping undo history when reloading files (PR#188, Arthur
+      Rosenstein).  This is not enabled by default in this release.
     * Respect filetype.common's wordchars if a filetype doesn't have its own
       (Issue#492, PR#501).
 


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    true        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", TRUE);
+		"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).


More information about the Commits mailing list