To: vim_dev@googlegroups.com Subject: Patch 8.2.2573 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2573 Problem: Vim9: using invalid pointer for error message. Solution: Use the right pointer. (closes #7921) Files: src/eval.c, src/testdir/test_vim9_expr.vim *** ../vim-8.2.2572/src/eval.c 2021-03-03 17:58:12.009789245 +0100 --- src/eval.c 2021-03-06 18:17:22.646476545 +0100 *************** *** 3130,3136 **** */ if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[1])) { ! error_white_both(p, 1); clear_tv(rettv); return FAIL; } --- 3130,3136 ---- */ if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[1])) { ! error_white_both(*arg, 1); clear_tv(rettv); return FAIL; } *** ../vim-8.2.2572/src/testdir/test_vim9_expr.vim 2021-02-28 16:55:07.513026844 +0100 --- src/testdir/test_vim9_expr.vim 2021-03-06 18:16:53.690553516 +0100 *************** *** 1254,1259 **** --- 1254,1270 ---- echo 'a' .. function('len') END CheckScriptFailure(lines, 'E729:', 2) + + lines =<< trim END + vim9script + new + ['']->setline(1) + /pattern + + eval 0 + bwipe! + END + CheckScriptFailure(lines, "E1004: White space required before and after '/' at \"/pattern") enddef def Test_expr5_vim9script_channel() *** ../vim-8.2.2572/src/version.c 2021-03-05 21:35:44.276045229 +0100 --- src/version.c 2021-03-06 18:10:28.671543715 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2573, /**/ -- Mushrooms always grow in damp places and so they look like umbrellas. /// 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 ///