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

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
master
Benno Schulenberg 2015-04-07 08:44:24 +00:00
parent 25ce5f6759
commit 2aac470cb9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -3,6 +3,8 @@
when nothing was sought yet (when historylog is set). when nothing was sought yet (when historylog is set).
* src/browser.c (filesearch_init): Remove an unfitting comment * src/browser.c (filesearch_init): Remove an unfitting comment
(there are no toggles here) and tweak some others. (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> 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

4
src/search.c
View File

@ -490,7 +490,7 @@ void do_search(void)
* back at the same position if the string isn't found again, in * back at the same position if the string isn't found again, in
* which case it's the only occurrence. */ * which case it's the only occurrence. */
if (ISSET(USE_REGEXP) && regexp_bol_or_eol(&search_regexp, if (ISSET(USE_REGEXP) && regexp_bol_or_eol(&search_regexp,
last_search)) { answer)) {
didfind = findnextstr( didfind = findnextstr(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
FALSE, FALSE,
@ -556,7 +556,7 @@ void do_research(void)
FALSE, FALSE,
#endif #endif
TRUE, openfile->current, openfile->current_x, TRUE, openfile->current, openfile->current_x,
answer, NULL); last_search, NULL);
if (fileptr == openfile->current && fileptr_x == if (fileptr == openfile->current && fileptr_x ==
openfile->current_x && !didfind) openfile->current_x && !didfind)
statusbar(_("This is the only occurrence")); statusbar(_("This is the only occurrence"));