From: Benno Schulenberg Date: Tue, 7 Apr 2015 08:19:04 +0000 (+0000) Subject: Not searching for the empty string when nothing was sought yet X-Git-Tag: v2.4.1~20 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=5d0b267aaa6fa34ba0e2607426bb011d614a43e5;p=nano.git Not searching for the empty string when nothing was sought yet in the file browser (when historylig is set). git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5177 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 40a5b345..7bc20533 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-04-07 Benno Schulenberg + * src/browser.c (do_fileresearch): Don't search for the empty string + when nothing was sought yet (when historylog is set). + 2015-04-05 Benno Schulenberg * doc/texinfo/nano.texi: Expand on nano's features, condense the synopsis, and "online" means something else to most people. diff --git a/src/browser.c b/src/browser.c index 12716a03..b967854d 100644 --- a/src/browser.c +++ b/src/browser.c @@ -898,7 +898,7 @@ void do_fileresearch(void) if (last_search[0] != '\0') { findnextfile_wrap_reset(); - didfind = findnextfile(FALSE, begin, answer); + didfind = findnextfile(FALSE, begin, last_search); /* Check to see if there's only one occurrence of the string and * we're on it now. */ @@ -907,7 +907,7 @@ void do_fileresearch(void) * should only end up back at the same position if the * string isn't found again, in which case it's the only * occurrence. */ - didfind = findnextfile(TRUE, begin, answer); + didfind = findnextfile(TRUE, begin, last_search); if (selected == begin && !didfind) statusbar(_("This is the only occurrence")); }