Eliding another miniscule function.

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

diff --git a/ChangeLog b/ChangeLog
index a4083d0edaa8d44bcdf45e2ca84f1da417bdb2c7..c2df1fd3823885a7ed8ae429a3b900f98c8c9df1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
        * src/{browser,files,help,prompt,text,winio}.c: Let the function
        bottombars() set the global variable 'currmenu' -- the displayed
        menu must necessarily be the active one.
+       * src/browser.c (filesearch_abort): Elide this function.
 
 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 7b631fff0458599bd5c5d3a8ca0452d27225f638..3123359a252182895de383f03c9f958ef48add20 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -817,13 +817,6 @@ void findnextfile(const char *needle)
     selected = currselected;
 }
 
-/* Abort the current filename search.  Clean up by setting the current
- * shortcut list to the browser shortcut list, and displaying it. */
-void filesearch_abort(void)
-{
-    bottombars(MBROWSER);
-}
-
 /* Search for a filename. */
 void do_filesearch(void)
 {
@@ -833,7 +826,7 @@ void do_filesearch(void)
 
     if (filesearch_init() != 0) {
        /* Cancelled or a blank search string. */
-       filesearch_abort();
+       bottombars(MBROWSER);
        return;
     }
 
@@ -852,7 +845,7 @@ void do_filesearch(void)
 
     findnextfile(answer);
 
-    filesearch_abort();
+    bottombars(MBROWSER);
 }
 
 /* Search for the last given filename again without prompting. */
@@ -865,8 +858,6 @@ void do_fileresearch(void)
        statusbar(_("No current search pattern"));
     else
        findnextfile(last_search);
-
-    filesearch_abort();
 }
 
 /* Select the first file in the list. */