From: Bram Moolenaar Date: Sat, 7 Jul 2018 14:41:13 +0000 (+0200) Subject: patch 8.1.0159: completion for user names does not work for a prefix. X-Git-Tag: v8.1.0159 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c5d1043022520512ee36aa1a29662b60af33c95;p=vim patch 8.1.0159: completion for user names does not work for a prefix. 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) --- diff --git a/src/ex_docmd.c b/src/ex_docmd.c index e198a286a..4b3fdac37 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3764,7 +3764,7 @@ set_one_cmd_context( * A full match ~user will be replaced by user's home * directory i.e. something like ~user -> /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 5242ca572..f0e629b5b 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 c8dde84e1..e19f35e9d 100644 --- a/src/version.c +++ b/src/version.c @@ -789,6 +789,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 159, /**/ 158, /**/