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)

diff --git a/src/eval.c b/src/eval.c
index 119b7cc189ac4c4cb68d0782ab2c0365d558fdad..87d2e16a7b37c2ca56e01378f9ea7894d581b177 100644 (file)
--- 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 8883ea3cc5d31c8543522ab99b77e4e79086aecc..249c32f126f579cd9366a64c19431a80d10c3f15 100644 (file)
--- 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 c169daf8d0c82bd950b75e72ec19d755f74e277b..9e33c542fe2aee2c1ff67c3107b8e941313bd919 100644 (file)
--- 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,
 /**/