To: vim_dev@googlegroups.com Subject: Patch 8.2.1360 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1360 Problem: Stray error for white space after expression. Solution: Ignore trailing white space. (closes #6608) Files: src/eval.c, src/testdir/test_filter_map.vim *** ../vim-8.2.1359/src/eval.c 2020-07-30 20:08:46.836890228 +0200 --- src/eval.c 2020-08-03 22:34:58.463711619 +0200 *************** *** 300,306 **** s = skipwhite(s); if (eval1_emsg(&s, rettv, NULL) == FAIL) return FAIL; ! if (*s != NUL) // check for trailing chars after expr { clear_tv(rettv); semsg(_(e_invexpr2), s); --- 300,306 ---- s = skipwhite(s); if (eval1_emsg(&s, rettv, NULL) == FAIL) return FAIL; ! if (*skipwhite(s) != NUL) // check for trailing chars after expr { clear_tv(rettv); semsg(_(e_invexpr2), s); *** ../vim-8.2.1359/src/testdir/test_filter_map.vim 2020-05-26 20:21:54.167611874 +0200 --- src/testdir/test_filter_map.vim 2020-08-03 22:37:52.579190527 +0200 *************** *** 11,16 **** --- 11,17 ---- 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 *** ../vim-8.2.1359/src/version.c 2020-08-02 20:40:40.089339804 +0200 --- src/version.c 2020-08-03 22:38:27.071087369 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1360, /**/ -- Amnesia is one of my favorite words, but I forgot what it means. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///