Commit 7098dd0c authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

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
No related merge requests found
Showing with 6 additions and 7 deletions
+6 -7
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* src/search.c (do_research): Use the Search key bindings also during * src/search.c (do_research): Use the Search key bindings also during
a Re-search, to enable cancelling. This fixes Savannah bug #47159. a Re-search, to enable cancelling. This fixes Savannah bug #47159.
* src/search.c (do_replace): Remove two redundant returns. * src/search.c (do_replace): Remove two redundant returns.
* src/search.c (findnextstr): Prune two #ifdefs.
2016-03-14 Benno Schulenberg <bensberg@justemail.net> 2016-03-14 Benno Schulenberg <bensberg@justemail.net>
* src/color.c (color_update): Don't dereference a possible NULL. * src/color.c (color_update): Don't dereference a possible NULL.
......
...@@ -340,13 +340,12 @@ bool findnextstr( ...@@ -340,13 +340,12 @@ bool findnextstr(
if (ISSET(BACKWARDS_SEARCH)) { if (ISSET(BACKWARDS_SEARCH)) {
fileptr = fileptr->prev; fileptr = fileptr->prev;
current_y_find--; current_y_find--;
} else { } else
#endif #endif
{
fileptr = fileptr->next; fileptr = fileptr->next;
current_y_find++; current_y_find++;
#ifndef NANO_TINY
} }
#endif
if (fileptr == NULL) { if (fileptr == NULL) {
/* We've reached the start or end of the buffer, so wrap around. */ /* We've reached the start or end of the buffer, so wrap around. */
...@@ -354,13 +353,12 @@ bool findnextstr( ...@@ -354,13 +353,12 @@ bool findnextstr(
if (ISSET(BACKWARDS_SEARCH)) { if (ISSET(BACKWARDS_SEARCH)) {
fileptr = openfile->filebot; fileptr = openfile->filebot;
current_y_find = editwinrows - 1; current_y_find = editwinrows - 1;
} else { } else
#endif #endif
{
fileptr = openfile->fileage; fileptr = openfile->fileage;
current_y_find = 0; current_y_find = 0;
#ifndef NANO_TINY
} }
#endif
statusbar(_("Search Wrapped")); statusbar(_("Search Wrapped"));
} }
...@@ -490,7 +488,7 @@ void do_findnext(void) ...@@ -490,7 +488,7 @@ void do_findnext(void)
} else } else
do_research(); do_research();
} }
#endif #endif /* !NANO_TINY */
#if !defined(NANO_TINY) || !defined(DISABLE_BROWSER) #if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
/* Search for the last string without prompting. */ /* Search for the last string without prompting. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment