diff options
author | Bram Moolenaar <Bram@vim.org> | 2009-06-24 15:05:00 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2009-06-24 15:05:00 +0000 |
commit | 8d3b8c4a8a48c5e7a8108dace0c5a2cc2a33ca10 (patch) | |
tree | 03a08d4a470ba2d20701a3e7d533fc811ff7abe9 | |
parent | 0dc79e85947627c6f1f9da770812785f9fd4f93b (diff) | |
download | vim-git-8d3b8c4a8a48c5e7a8108dace0c5a2cc2a33ca10.tar.gz |
updated for version 7.2-214v7.2.214
-rw-r--r-- | src/ex_getln.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index cef839214..c9d8c3053 100644 --- 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 c367c1029..0ef972ad3 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 214, +/**/ 213, /**/ 212, |