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

Removing two redundant returns, and condensing six comments. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5739 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-03-17 10:06:15 +00:00
parent 19bc63db28
commit 988274bb70
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2016-03-17 Benno Schulenberg <bensberg@justemail.net>
* 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.
2016-03-14 Benno Schulenberg <bensberg@justemail.net>
* src/color.c (color_update): Don't dereference a possible NULL.

21
src/search.c
View File

@ -424,15 +424,12 @@ void do_search(void)
i = search_init(FALSE, FALSE);
if (i == -1)
/* Cancel, Go to Line, blank search string, or regcomp() failed. */
if (i == -1) /* Cancelled, or some other exit reason. */
search_replace_abort();
else if (i == -2)
/* Replace. */
else if (i == -2) /* Do a replace instead. */
do_replace();
#if !defined(NANO_TINY) || defined(HAVE_REGEX_H)
else if (i == 1)
/* Case Sensitive, Backwards, or Regexp search toggle. */
else if (i == 1) /* Toggled something. */
do_search();
#endif
@ -848,16 +845,12 @@ void do_replace(void)
}
i = search_init(TRUE, FALSE);
if (i == -1) {
/* Cancel, Go to Line, blank search string, or regcomp() failed. */
if (i == -1) /* Cancelled, or some other exit reason. */
search_replace_abort();
return;
} else if (i == -2) {
/* No Replace. */
else if (i == -2) /* Do a search instead. */
do_search();
return;
} else if (i == 1)
/* Case Sensitive, Backwards, or Regexp search toggle. */
else if (i == 1) /* Toggled something. */
do_replace();
if (i != 0)