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

Removing an unused variable, and adjusting the introductory comment 

for the recently tweaked logic.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5192 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-04-12 09:04:30 +00:00
parent 4e9b3687ba
commit 4e5ea18394
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -5,6 +5,8 @@
* src/global.c (shortcut_init): Rebind ^Y and ^V in the WhereisFile * src/global.c (shortcut_init): Rebind ^Y and ^V in the WhereisFile
menu from the pointless page_up() and page_down() to the effective menu from the pointless page_up() and page_down() to the effective
first_file() and last_file(). Also unbind some other useless keys. first_file() and last_file(). Also unbind some other useless keys.
* src/browser.c (filesearch_init): Remove an unused variable, and
adjust the introductory comment for the recently tweaked logic.
2015-04-11 Benno Schulenberg <bensberg@justemail.net> 2015-04-11 Benno Schulenberg <bensberg@justemail.net>
* src/search.c (do_replace_loop): Do not split off the marked region * src/search.c (do_replace_loop): Do not split off the marked region

20
src/browser.c
View File

@ -697,20 +697,14 @@ void browser_select_dirname(const char *needle)
} }
} }
/* Set up the system variables for a filename search. Return -1 if the /* Set up the system variables for a filename search. Return -1 or -2 if
* search should be canceled (due to Cancel, a blank search string, or a * the search should be canceled (due to Cancel or a blank search string),
* failed regcomp()), return 0 on success, and return 1 on rerun calling * return 0 when we have a string, and return a positive value when some
* program. */ * function was run. */
int filesearch_init(void) int filesearch_init(void)
{ {
int input; int input;
char *buf; char *buf;
static char *backupstring = NULL;
/* The search string we'll be using. */
/* If backupstring doesn't exist, initialize it to "". */
if (backupstring == NULL)
backupstring = mallocstrcpy(NULL, "");
if (last_search == NULL) if (last_search == NULL)
last_search = mallocstrcpy(NULL, ""); last_search = mallocstrcpy(NULL, "");
@ -731,7 +725,7 @@ int filesearch_init(void)
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
TRUE, TRUE,
#endif #endif
MWHEREISFILE, backupstring, MWHEREISFILE, NULL,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
&search_history, &search_history,
#endif #endif
@ -740,9 +734,6 @@ int filesearch_init(void)
/* Release buf now that we don't need it anymore. */ /* Release buf now that we don't need it anymore. */
free(buf); free(buf);
free(backupstring);
backupstring = NULL;
/* If only Enter was pressed but we have a previous string, it's okay. */ /* If only Enter was pressed but we have a previous string, it's okay. */
if (input == -2 && *last_search != '\0') if (input == -2 && *last_search != '\0')
return 0; return 0;
@ -751,7 +742,6 @@ int filesearch_init(void)
if (input < 0) if (input < 0)
statusbar(_("Cancelled")); statusbar(_("Cancelled"));
/* Zero is good; positive values mean some function was run. */
return input; return input;
} }