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
@@ -789,6 +789,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    159,
 /**/
     158,
 /**/