# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1596487507 -7200
# Node ID 46956b6811a15c3c0f557939a752cea118683acf
# Parent  aae35544194c3094bbd9699943a0408156f42133
patch 8.2.1360: stray error for white space after expression

Commit: https://github.com/vim/vim/commit/f96e9dec636d7d105b015680d8c5d6b47d936e01
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Aug 3 22:39:28 2020 +0200

    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 https://github.com/vim/vim/issues/6608)

diff --git a/src/eval.c b/src/eval.c
--- a/src/eval.c
+++ b/src/eval.c
@@ -300,7 +300,7 @@ eval_expr_typval(typval_T *expr, typval_
 	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
--- 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
--- 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,