diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-08-03 22:39:28 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-08-03 22:39:28 +0200 |
commit | f96e9dec636d7d105b015680d8c5d6b47d936e01 (patch) | |
tree | 33aa2dc0995d37b12de0da54e0d5d3002c03a764 | |
parent | 83144546488b544a1fe4e2a4f8be954b98c696fc (diff) |
patch 8.2.1360: stray error for white space after expressionv8.2.1360
Problem: Stray error for white space after expression.
Solution: Ignore trailing white space. (closes #6608)
-rw-r--r-- | src/eval.c | 2 | ||||
-rw-r--r-- | src/testdir/test_filter_map.vim | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 119b7cc189..87d2e16a7b 100644 --- a/src/eval.c +++ b/src/eval.c @@ -300,7 +300,7 @@ eval_expr_typval(typval_T *expr, typval_T *argv, int argc, typval_T *rettv) s = skipwhite(s); if (eval1_emsg(&s, rettv, NULL) == FAIL) return FAIL; - if (*s != NUL) // check for trailing chars after expr + if (*skipwhite(s) != NUL) // check for trailing chars after expr { clear_tv(rettv); semsg(_(e_invexpr2), s); diff --git a/src/testdir/test_filter_map.vim b/src/testdir/test_filter_map.vim index 8883ea3cc5..249c32f126 100644 --- a/src/testdir/test_filter_map.vim +++ b/src/testdir/test_filter_map.vim @@ -11,6 +11,7 @@ func Test_filter_map_list_expr_string() call assert_equal([2, 4, 6, 8], map([1, 2, 3, 4], 'v:val * 2')) call assert_equal([0, 2, 4, 6], map([1, 2, 3, 4], 'v:key * 2')) call assert_equal([9, 9, 9, 9], map([1, 2, 3, 4], 9)) + call assert_equal([7, 7, 7], map([1, 2, 3], ' 7 ')) endfunc " dict with expression string diff --git a/src/version.c b/src/version.c index c169daf8d0..9e33c542fe 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1360, +/**/ 1359, /**/ 1358, |