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

Pruning two #ifdefs, like elsewhere, to reduce the clutter. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5740 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-03-17 18:51:46 +00:00
parent 988274bb70
commit 7098dd0cd0
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
* src/search.c (do_research): Use the Search key bindings also during
a Re-search, to enable cancelling. This fixes Savannah bug #47159.
* src/search.c (do_replace): Remove two redundant returns.
* src/search.c (findnextstr): Prune two #ifdefs.
2016-03-14 Benno Schulenberg <bensberg@justemail.net>
* src/color.c (color_update): Don't dereference a possible NULL.

12
src/search.c
View File

@ -340,13 +340,12 @@ bool findnextstr(
if (ISSET(BACKWARDS_SEARCH)) {
fileptr = fileptr->prev;
current_y_find--;
} else {
} else
#endif
{
fileptr = fileptr->next;
current_y_find++;
#ifndef NANO_TINY
}
#endif
if (fileptr == NULL) {
/* We've reached the start or end of the buffer, so wrap around. */
@ -354,13 +353,12 @@ bool findnextstr(
if (ISSET(BACKWARDS_SEARCH)) {
fileptr = openfile->filebot;
current_y_find = editwinrows - 1;
} else {
} else
#endif
{
fileptr = openfile->fileage;
current_y_find = 0;
#ifndef NANO_TINY
}
#endif
statusbar(_("Search Wrapped"));
}
@ -490,7 +488,7 @@ void do_findnext(void)
} else
do_research();
}
#endif
#endif /* !NANO_TINY */
#if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
/* Search for the last string without prompting. */