LineageOS/android_external_nano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tabbing: refresh the window also when Goto-Dir in browser was cancelled

Browse Source 
This restores things to the way they were before commit 36ec76a.
Apparently all those refreshes are needed in some cases after all.
This commit is contained in:
Benno Schulenberg
2016-04-26 17:50:25 +02:00
parent 133ed4e21d
commit 30f3c53305
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/files.c
View File

@@ -2755,14 +2755,15 @@ char **cwd_tab_completion(const char *buf, bool allow_files, size_t
* position should be advanced. refresh_func is the function we will
* call to refresh the edit window. */
char *input_tab(char *buf, bool allow_files, size_t *place,
bool *lastwastab, void (*refresh_func)(void))
bool *lastwastab, void (*refresh_func)(void), bool *listed)
{
size_t num_matches = 0, buf_len;
char **matches = NULL;
bool listed = FALSE;
assert(buf != NULL && place != NULL && *place <= strlen(buf) &&
lastwastab != NULL && refresh_func != NULL);
lastwastab != NULL && refresh_func != NULL && listed != NULL);
*listed = FALSE;
/* If the word starts with `~' and there is no slash in the word,
* then try completing this word as a username. */
@@ -2888,8 +2889,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place,
}
wnoutrefresh(edit);
refresh_needed = TRUE;
listed = TRUE;
*listed = TRUE;
}
free(mzero);
@@ -2897,8 +2897,9 @@ char *input_tab(char *buf, bool allow_files, size_t *place,
free_chararray(matches, num_matches);
/* Refresh the edit window just in case a previous tab showed a list. */
if (!listed)
/* When we didn't list any matches now, refresh the edit window, just
* in case a previous tab showed a list, so we know where we are. */
if (!*listed)
refresh_func();
return buf;