diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-11-12 23:12:55 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-12 23:12:55 +0000 |
| commit | 28c56d501352bd98472d23667bade683877cadcc (patch) | |
| tree | ed33b5fb6bfe7cda3db747824872ccf247afb6dd | |
| parent | 1140b51e8369fed2321ce16bd4530a0952362126 (diff) | |
patch 9.0.0869: bogus error when string used after :elseifv9.0.0869
Problem: Bogus error when string used after :elseif.
Solution: Do not consider a double quote the start of a comment.
(closes #11534)
| -rw-r--r-- | src/ex_eval.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_vimscript.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index e1c28899e1..68dc6d78ca 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1173,7 +1173,8 @@ ex_else(exarg_T *eap) { // When skipping we ignore most errors, but a missing expression is // wrong, perhaps it should have been "else". - if (skip && ends_excmd(*eap->arg)) + // A double quote here is the start of a string, not a comment. + if (skip && *eap->arg != '"' && ends_excmd(*eap->arg)) semsg(_(e_invalid_expression_str), eap->arg); else result = eval_to_bool(eap->arg, &error, eap, skip, FALSE); diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim index 4aa6bca926..a23bac3d3e 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -192,6 +192,16 @@ func Test_if_while() call assert_equal('ab3j3b2c2b1f1h1km', g:Xpath) endfunc +" Check double quote after skipped "elseif" does not give error E15 +func Test_skipped_elseif() + if "foo" ==? "foo" + let result = "first" + elseif "foo" ==? "foo" + let result = "second" + endif + call assert_equal('first', result) +endfunc + "------------------------------------------------------------------------------- " Test 4: :return {{{1 "------------------------------------------------------------------------------- diff --git a/src/version.c b/src/version.c index b16f86040a..10aa6dedcc 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 869, +/**/ 868, /**/ 867, |