From: Benno Schulenberg <bensberg@justemail.net>
Date: Tue, 7 Apr 2015 11:04:32 +0000 (+0000)
Subject: Avoiding to set 'focusing' when searching for filenames;
X-Git-Tag: v2.4.1~16
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a9647b0508f82cbecac534dfbea23c418b75bda5;p=nano.git

Avoiding to set 'focusing' when searching for filenames;
it should be set only when searching/replacing text.


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

diff --git a/ChangeLog b/ChangeLog
index f3121328..cb4489e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	in the surrounding code, for consistency.
 	* src/browser.c (findnextfile_wrap_reset): Elide this function,
 	and rename 'search_last_file' to 'came_full_circle'.
+	* src/browser.c (filesearch_init, do_fileresearch): Avoid setting
+	'focusing' when searching only for filenames.
 
 2015-04-05  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/texinfo/nano.texi: Expand on nano's features, condense the
diff --git a/src/browser.c b/src/browser.c
index 4fe2269c..82790107 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -724,7 +724,8 @@ int filesearch_init(void)
     if (backupstring == NULL)
 	backupstring = mallocstrcpy(NULL, "");
 
-    search_init_globals();
+    if (last_search == NULL)
+	last_search = mallocstrcpy(NULL, "");
 
     if (last_search[0] != '\0') {
 	char *disp = display_string(last_search, 0, COLS / 3, FALSE);
@@ -877,7 +878,8 @@ void do_fileresearch(void)
     size_t begin = selected;
     bool didfind;
 
-    search_init_globals();
+    if (last_search == NULL)
+	last_search = mallocstrcpy(NULL, "");
 
     if (last_search[0] != '\0') {
 	came_full_circle = FALSE;