mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-25 22:29:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: elide a variable, and shortcircuit a return

Browse Source 
Instead of first trying to match things, and then discarding these
matches when the cursor is not at the end of the offered fragment
('buf'), simply don't bother to do any matching in that case.
This commit is contained in:
Benno Schulenberg 2020-06-18 11:54:40 +02:00
parent 0bced0a5e9
commit b61d97eb9a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/files.c
View File

@ -2500,11 +2500,17 @@ char **cwd_tab_completion(const char *buf, bool allow_files,
char *input_tab(char *buf, bool allow_files, size_t *place,
bool *lastwastab, void (*refresh_func)(void), bool *listed)
{
size_t num_matches = 0, buf_len;
size_t num_matches = 0;
char **matches = NULL;
*listed = FALSE;
/* If the cursor is not at the end of the fragment, do nothing. */
if (buf[*place] != '\0') {
beep();
return buf;
}
/* If the word starts with `~' and there is no slash in the word,
* then try completing this word as a username. */
if (*place > 0 && *buf == '~') {
@ -2518,9 +2524,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place,
if (matches == NULL)
matches = cwd_tab_completion(buf, allow_files, &num_matches, *place);
buf_len = strlen(buf);
if (num_matches == 0 || *place != buf_len)
if (num_matches == 0)
beep();
else {
size_t match, common_len = 0;
@ -2567,8 +2571,8 @@ char *input_tab(char *buf, bool allow_files, size_t *place,
/* If the matches have something in common, show that part. */
if (common_len != *place) {
buf = charealloc(buf, common_len + buf_len - *place + 1);
memmove(buf + common_len, buf + *place, buf_len - *place + 1);
buf = charealloc(buf, common_len + 1);
memmove(buf + common_len, buf + *place, 1);
strncpy(buf, mzero, common_len);
*place = common_len;
}