Merge pull request #4358 from jbradaric/vim-7.4.1112

vim-patch:7.4.1112
This commit is contained in:
Justin M. Keyes 2016-02-27 19:08:28 -05:00
commit 62321e5132
2 changed files with 2 additions and 4 deletions

View File

@ -1537,9 +1537,7 @@ do_arglist (
int i = expand_wildcards(new_ga.ga_len, (char_u **)new_ga.ga_data,
&exp_count, &exp_files, EW_DIR|EW_FILE|EW_ADDSLASH|EW_NOTFOUND);
ga_clear(&new_ga);
if (i == FAIL)
return FAIL;
if (exp_count == 0) {
if (i == FAIL || exp_count == 0) {
EMSG(_(e_nomatch));
return FAIL;
}

View File

@ -178,7 +178,7 @@ static int included_patches[] = {
// 1115 NA
// 1114,
// 1113,
// 1112,
1112,
// 1111,
// 1110,
// 1109 NA