diff options
| -rw-r--r-- | src/nvim/ex_cmds2.c | 4 | ||||
| -rw-r--r-- | src/nvim/main.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 24 |
3 files changed, 15 insertions, 16 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 1f4020b225..71ea170e1c 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -1540,9 +1540,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/main.c b/src/nvim/main.c index a2aca65001..09fe29c087 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -324,7 +324,8 @@ int main(int argc, char **argv) "'\\c\\mterm://\\%(.\\{-}//\\%(\\d\\+:\\)\\?\\)\\?\\zs.*'), " // capture the working directory "{'cwd': get(matchlist(expand(\"<amatch>\"), " - "'\\c\\mterm://\\(.\\{-}\\)//'), 1, '')})"); + "'\\c\\mterm://\\(.\\{-}\\)//'), 1, '')})" + "|doautocmd TermOpen"); /* Execute --cmd arguments. */ exe_pre_commands(¶ms); diff --git a/src/nvim/version.c b/src/nvim/version.c index 80b1b236dd..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 @@ -297,7 +297,7 @@ static int included_patches[] = { // 996 NA // 995 NA // 994 NA - // 993, + // 993 NA // 992 NA 991, // 990 NA @@ -316,12 +316,12 @@ static int included_patches[] = { 977, // 976 NA 975, - // 974, + 974, // 973, 972, // 971 NA // 970 NA - // 969, + // 969 NA // 968 NA // 967 NA // 966 NA @@ -334,7 +334,7 @@ static int included_patches[] = { // 959 NA // 958, // 957, - // 956, + // 956 NA 955, // 954 NA 953, @@ -343,11 +343,11 @@ static int included_patches[] = { 950, 949, // 948 NA - // 947, + // 947 NA 946, 945, 944, - // 943, + // 943 NA // 942, // 941, // 940 NA @@ -376,17 +376,17 @@ static int included_patches[] = { // 917 NA 916, 915, - // 914, + // 914 NA // 913 NA 912, // 911 NA // 910 NA - // 909, + // 909 NA // 908 NA // 907 NA // 906 NA - // 905, - // 904, + // 905 NA + // 904 NA 903, // 902 NA 901, @@ -398,7 +398,7 @@ static int included_patches[] = { 895, // 894 NA 893, - // 892, + // 892 NA 891, // 890 NA // 889, |