summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-16 22:49:34 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-16 22:49:34 +0100
commit2db5c3b3ceeaded7fb5a64dc5cb22b0cb95b78a1 (patch)
treee4bc1991902d8a2e1957964c1ed2e8a543ac7959
parentf60b796fa9870bdfc4cdeb91653bac041916077d (diff)
downloadvim-git-7.4.1112.tar.gz
patch 7.4.1112v7.4.1112
Problem: When using ":next" with an illegal file name no error is reported. Solution: Give an error message.
-rw-r--r--src/ex_cmds2.c4
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 676cf117b..5b113668d 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2147,9 +2147,7 @@ do_arglist(str, what, after)
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;
diff --git a/src/version.c b/src/version.c
index ac54f8496..4cce40b91 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1112,
+/**/
1111,
/**/
1110,