nano

commit 19bc63db2812ff102d1ee8727672e853efee031b
parent 8866f728a2d2490b082c9ee95d4f1c2982147a85
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Thu, 17 Mar 2016 09:12:30 +0000

Using the Search key bindings also during a Re-search, to enable cancelling.
This fixes Savannah bug #47159.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5738 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/search.c
 | 
3
+++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +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.
+
 2016-03-14  Benno Schulenberg  <bensberg@justemail.net>
 	* src/color.c (color_update): Don't dereference a possible NULL.
 	* src/rcfile.c (parse_colors): Make error message equal to others.
diff --git a/src/search.c b/src/search.c
@@ -522,6 +522,9 @@ void do_research(void)
 	    return;
 #endif
 
+	/* Use the search-menu key bindings, to allow cancelling. */
+	currmenu = MWHEREIS;
+
 	findnextstr_wrap_reset();
 	didfind = findnextstr(
 #ifndef DISABLE_SPELLER