ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
Benno Schulenberg 2015-04-07 08:19:04 +00:00
parent c2ed8277c2
commit 5d0b267aaa
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2015-04-07 Benno Schulenberg <bensberg@justemail.net>
* 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 <bensberg@justemail.net> 2015-04-05 Benno Schulenberg <bensberg@justemail.net>
* doc/texinfo/nano.texi: Expand on nano's features, condense the * doc/texinfo/nano.texi: Expand on nano's features, condense the
synopsis, and "online" means something else to most people. synopsis, and "online" means something else to most people.

4
src/browser.c
View File

@ -898,7 +898,7 @@ void do_fileresearch(void)
if (last_search[0] != '\0') { if (last_search[0] != '\0') {
findnextfile_wrap_reset(); 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 /* Check to see if there's only one occurrence of the string and
* we're on it now. */ * we're on it now. */
@ -907,7 +907,7 @@ void do_fileresearch(void)
* should only end up back at the same position if the * should only end up back at the same position if the
* string isn't found again, in which case it's the only * string isn't found again, in which case it's the only
* occurrence. */ * occurrence. */
didfind = findnextfile(TRUE, begin, answer); didfind = findnextfile(TRUE, begin, last_search);
if (selected == begin && !didfind) if (selected == begin && !didfind)
statusbar(_("This is the only occurrence")); statusbar(_("This is the only occurrence"));
} }