diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-07-07 16:41:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-07-07 16:41:13 +0200 |
| commit | 6c5d1043022520512ee36aa1a29662b60af33c95 (patch) | |
| tree | 05f2a6867642e98c43a591cb2c264fdaf86fe514 | |
| parent | 1ebff3dc93b6d022ccfe0613c1d1ee2d62fc7935 (diff) | |
patch 8.1.0159: completion for user names does not work for a prefix.v8.1.0159
Problem: Completion for user names does not work if a prefix is also a full
matching name. (Nazri Ramliy)
Solution: Accept both full and partial matches. (Dominique Pelle)
| -rw-r--r-- | src/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/misc1.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index e198a286af..4b3fdac375 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3764,7 +3764,7 @@ set_one_cmd_context( * A full match ~user<Tab> will be replaced by user's home * directory i.e. something like ~user<Tab> -> /home/user/ */ if (*p == NUL && p > xp->xp_pattern + 1 - && match_user(xp->xp_pattern + 1) == 1) + && match_user(xp->xp_pattern + 1) >= 1) { xp->xp_context = EXPAND_USER; ++xp->xp_pattern; diff --git a/src/misc1.c b/src/misc1.c index 5242ca5729..f0e629b5bd 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -4827,7 +4827,8 @@ get_users(expand_T *xp UNUSED, int idx) * 1 if name partially matches the beginning of a user name. * 2 is name fully matches a user name. */ -int match_user(char_u* name) + int +match_user(char_u *name) { int i; int n = (int)STRLEN(name); diff --git a/src/version.c b/src/version.c index c8dde84e1e..e19f35e9dc 100644 --- a/src/version.c +++ b/src/version.c @@ -790,6 +790,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 159, +/**/ 158, /**/ 157, |