nano

commit 311f0e8734c69b9ce48daab68604abe51b19bf7d
parent 9f93b33d29a70ea2a81847699ee9a9c1f7d3f22d
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sat, 19 Mar 2016 20:19:49 +0000

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

Diffstat:
M
ChangeLog
 | 
1
+
M
src/search.c
 | 
8
+++-----

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git 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
@@ -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;
     }