# HG changeset patch # User Bram Moolenaar # Date 1648998902 -7200 # Node ID fae7d94220e3615b644ba1bd1e2e6048f884424b # Parent 02ec20ca35761a67cde0a6e257a011da9ae23a1c patch 8.2.4675: no error for missing expression after :elseif Commit: https://github.com/vim/vim/commit/fa010cdfb115fd2f6bae7ea6f6e63be906b5e347 Author: Bram Moolenaar Date: Sun Apr 3 16:13:07 2022 +0100 patch 8.2.4675: no error for missing expression after :elseif Problem: No error for missing expression after :elseif. (Ernie Rael) Solution: Check for missing expression. (closes https://github.com/vim/vim/issues/10068) diff --git a/src/ex_eval.c b/src/ex_eval.c --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1146,7 +1146,12 @@ ex_else(exarg_T *eap) if (eap->cmdidx == CMD_elseif) { - result = eval_to_bool(eap->arg, &error, eap, skip); + // When skipping we ignore most errors, but a missing expression is + // wrong, perhaps it should have been "else". + if (skip && ends_excmd(*eap->arg)) + semsg(_(e_invalid_expression_str), eap->arg); + else + result = eval_to_bool(eap->arg, &error, eap, skip); // When throwing error exceptions, we want to throw always the first // of several errors in a row. This is what actually happens when diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1605,6 +1605,16 @@ def Test_if_elseif_else_fails() endif END v9.CheckDefFailure(lines, 'E488:') + + lines =<< trim END + var cond = true + if cond + echo 'true' + elseif + echo 'false' + endif + END + v9.CheckDefAndScriptFailure(lines, ['E1143:', 'E15:'], 4) enddef let g:bool_true = v:true diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4675, +/**/ 4674, /**/ 4673,