diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-27 19:08:28 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-27 19:08:28 -0500 |
| commit | 62321e5132ed29b11f79c8a56ca172d56b9ac042 (patch) | |
| tree | 186dce24ed0332e43b39009ff852b4fe0dda3f34 | |
| parent | ba1348edc5ea99f45ac98d6445a6a918a7e681fb (diff) | |
| parent | 8d5e60d8afa2e5e6940cbed59a353c51817cb89a (diff) | |
| download | rneovim-62321e5132ed29b11f79c8a56ca172d56b9ac042.tar.gz rneovim-62321e5132ed29b11f79c8a56ca172d56b9ac042.tar.bz2 rneovim-62321e5132ed29b11f79c8a56ca172d56b9ac042.zip | |
Merge pull request #4358 from jbradaric/vim-7.4.1112
vim-patch:7.4.1112
| -rw-r--r-- | src/nvim/ex_cmds2.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 47774f5a99..b415b51d71 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -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; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 678ba302fc..3acecf2b40 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -178,7 +178,7 @@ static int included_patches[] = { // 1115 NA // 1114, // 1113, - // 1112, + 1112, // 1111, // 1110, // 1109 NA |