From f96e9dec636d7d105b015680d8c5d6b47d936e01 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 3 Aug 2020 22:39:28 +0200 Subject: patch 8.2.1360: stray error for white space after expression Problem: Stray error for white space after expression. Solution: Ignore trailing white space. (closes #6608) --- src/eval.c | 2 +- src/testdir/test_filter_map.vim | 1 + src/version.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/eval.c b/src/eval.c index 119b7cc18..87d2e16a7 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 8883ea3cc..249c32f12 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 c169daf8d..9e33c542f 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1360, /**/ 1359, /**/ -- cgit v1.2.1