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 #10068)
diff --git a/src/ex_eval.c b/src/ex_eval.c
index e3c544b..9a2792a 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -1146,7 +1146,12 @@
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
index 5486458..56842b3 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1605,6 +1605,16 @@
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
index 602366f..ec9be28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4675,
+/**/
4674,
/**/
4673,