From: Benno Schulenberg <bensberg@justemail.net>
Date: Thu, 17 Mar 2016 09:12:30 +0000 (+0000)
Subject: Using the Search key bindings also during a Re-search, to enable cancelling.
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=19bc63db2812ff102d1ee8727672e853efee031b;p=nano.git

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
---

diff --git a/ChangeLog b/ChangeLog
index 9c836ea1..0e85cc40 100644
--- 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
index 48ffb9f5..38c0bceb 100644
--- 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