diff --git a/ChangeLog b/ChangeLog index 9b718b210a3afb687e58cda063553c9c4bdaa4c7..acd6e06cdf4ee29b5aee7de1d2407c60affeca05 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 a1e2bb3b3516b22b793e4f93675f3cf22c41aea3..4deca0b3dc9cce8befc1353dd4f99327915b537c 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"));