nano

commit 4edc83c3c2f9f8ebb048d243c381339bb9dac5ae
parent e6350aaba49e4e8d70fbb6432aa30920fd9208e4
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Thu, 22 Dec 2016 17:08:10 +0100

tweaks: move a setting to a better place -- it needs setting just once

Diffstat:
M
src/search.c
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/search.c b/src/search.c
@@ -664,18 +664,17 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 
 	    if (i == -1)  /* The replacing was cancelled. */
 		break;
+	    else if (i == 2)
+		replaceall = TRUE;
 	}
 
-	if (i > 0 || replaceall) {	/* Yes, replace it!!!! */
+	if (i == 1 || replaceall) {  /* Yes, replace it. */
 	    char *copy;
 	    size_t length_change;
 
 #ifndef NANO_TINY
 	    add_undo(REPLACE);
 #endif
-	    if (i == 2)
-		replaceall = TRUE;
-
 	    copy = replace_line(needle);
 
 	    length_change = strlen(copy) - strlen(openfile->current->data);