updated for version 7.2-214

diff --git a/src/ex_getln.c b/src/ex_getln.c
index cef839214191b2b1db3fd30d23fefa11c09e477d..c9d8c3053a77b4e2a709ad9e52b22ba633e96229 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4874,14 +4874,14 @@ ExpandUserList(xp, num_file, file)
     /* Loop over the items in the list. */
     for (li = retlist->lv_first; li != NULL; li = li->li_next)
     {
-       if (li->li_tv.v_type != VAR_STRING)
-           continue;  /* Skip non-string items */
+       if (li->li_tv.v_type != VAR_STRING || li->li_tv.vval.v_string == NULL)
+           continue;  /* Skip non-string items and empty strings */
 
        if (ga_grow(&ga, 1) == FAIL)
            break;
 
        ((char_u **)ga.ga_data)[ga.ga_len] =
-           vim_strsave(li->li_tv.vval.v_string);
+                                        vim_strsave(li->li_tv.vval.v_string);
        ++ga.ga_len;
     }
     list_unref(retlist);

diff --git a/src/version.c b/src/version.c
index c367c102972fb897b1e02e4f932877baf38af7d3..0ef972ad33dcf5e824cd071f0702c7b4ba023a16 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    214,
 /**/
     213,
 /**/