diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-02-27 18:43:05 +0100 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2016-02-27 18:47:04 +0100 |
| commit | 8d5e60d8afa2e5e6940cbed59a353c51817cb89a (patch) | |
| tree | 0c7146f3cf65c27efe54fe397a4f12b0e5544f07 | |
| parent | 3e0fab6b7ca3ece5ffe8cf07cb80f4037c08e3f0 (diff) | |
| download | rneovim-8d5e60d8afa2e5e6940cbed59a353c51817cb89a.tar.gz rneovim-8d5e60d8afa2e5e6940cbed59a353c51817cb89a.tar.bz2 rneovim-8d5e60d8afa2e5e6940cbed59a353c51817cb89a.zip | |
vim-patch:7.4.1112
Problem: When using ":next" with an illegal file name no error is reported.
Solution: Give an error message.
https://github.com/vim/vim/commit/2db5c3b3ceeaded7fb5a64dc5cb22b0cb95b78a1
| -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 80b1b236dd..2048e82c93 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 |