From: Benno Schulenberg <bensberg@justemail.net>
Date: Tue, 7 Apr 2015 08:44:24 +0000 (+0000)
Subject: Consistently using the appropriate variable in the appropriate function.
X-Git-Tag: v2.4.1~18
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2aac470cb9300797519fe1b294360c45496a5d09;p=nano.git

Consistently using the appropriate variable in the appropriate function.


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

diff --git a/ChangeLog b/ChangeLog
index 9b718b21..acd6e06c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	when nothing was sought yet (when historylog is set).
 	* src/browser.c (filesearch_init): Remove an unfitting comment
 	(there are no toggles here) and tweak some others.
+	* src/search.c (do_search, do_research): Use the same variable as
+	in the surrounding code, for consistency.
 
 2015-04-05  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/texinfo/nano.texi: Expand on nano's features, condense the
diff --git a/src/search.c b/src/search.c
index a1e2bb3b..4deca0b3 100644
--- a/src/search.c
+++ b/src/search.c
@@ -490,7 +490,7 @@ void do_search(void)
 	 * back at the same position if the string isn't found again, in
 	 * which case it's the only occurrence. */
 	if (ISSET(USE_REGEXP) && regexp_bol_or_eol(&search_regexp,
-		last_search)) {
+		answer)) {
 	    didfind = findnextstr(
 #ifndef DISABLE_SPELLER
 		FALSE,
@@ -556,7 +556,7 @@ void do_research(void)
 			FALSE,
 #endif
 			TRUE, openfile->current, openfile->current_x,
-			answer, NULL);
+			last_search, NULL);
 		if (fileptr == openfile->current && fileptr_x ==
 			openfile->current_x && !didfind)
 		    statusbar(_("This is the only occurrence"));