Snipping a useless setting of answer -- the Replace is being /cancelled/,

and the next time a Search or Replace is run, this answer is overwritten
with an empty string.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5749 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 5350e48c2950e85058113af08f07be8306645d54..3ddb19a4cd344d96998c7a87ef6797bc92dc68a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
        * src/search.c (do_gotolinecolumn): Delete another unneeded variable.
        * src/search.c (search_init): Snip an always-FALSE condition.
        * src/search.c (search_init): Reshuffle stuff to reduce indentation.
+       * src/search.c (do_replace): Snip a useless setting of answer.
 
 2016-03-17  Benno Schulenberg  <bensberg@justemail.net>
        * src/search.c (do_research): Use the Search key bindings also during

diff --git a/src/search.c b/src/search.c
index a26fad5504145f0951a1b96286b2b60674cd7aff..635266dafcce863ed1217e426400db3d8ff8398d 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -861,12 +861,10 @@ void do_replace(void)
        update_history(&replace_history, answer);
 #endif
 
-    if (i != 0 && i != -2) {
-       if (i == -1) {          /* Cancel. */
-           if (last_replace[0] != '\0')
-               answer = mallocstrcpy(answer, last_replace);
+    /* When cancelled, or when a function was run, get out. */
+    if (i == -1 || i > 0) {
+       if (i == -1)
            statusbar(_("Cancelled"));
-       }
        search_replace_abort();
        return;
     }