1
0
forked from aniani/vim

patch 7.4.2112

Problem:    getcompletion(.., 'dir') returns a match with trailing "*" when
            there are no matches. (Chdiza)
Solution:   Return an empty list when there are no matches.  Add a trailing
            slash to directories. (Yegappan Lakshmanan)  Add tests for no
            matches. (closes #947)
This commit is contained in:
Bram Moolenaar
2016-07-28 22:53:37 +02:00
parent 471a897569
commit b56195ed00
3 changed files with 37 additions and 5 deletions

View File

@@ -4164,8 +4164,8 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
{
char_u *pat;
expand_T xpc;
int options = WILD_KEEP_ALL | WILD_SILENT | WILD_USE_NL
| WILD_LIST_NOTFOUND | WILD_NO_BEEP;
int options = WILD_SILENT | WILD_USE_NL | WILD_ADD_SLASH
| WILD_NO_BEEP;
if (p_wic)
options |= WILD_ICASE;
@@ -4194,7 +4194,7 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);
if ((rettv_list_alloc(rettv) != FAIL) && (pat != NULL))
{
int i;
int i;
ExpandOne(&xpc, pat, NULL, options, WILD_ALL_KEEP);