To: vim_dev@googlegroups.com Subject: Patch 8.2.3342 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3342 (after 8.2.3341) Problem: Test for :let errors fails. Solution: Adjust the test and how to avoid a second error message. Files: src/evalvars.c, src/testdir/test_let.vim *** ../vim-8.2.3341/src/evalvars.c 2021-08-14 14:00:58.229863901 +0200 --- src/evalvars.c 2021-08-14 14:26:05.327761612 +0200 *************** *** 1184,1189 **** --- 1184,1190 ---- char_u *arg_subsc; char_u *tofree; typval_T tv; + int prev_uncaught_emsg = uncaught_emsg; while (!ends_excmd2(eap->cmd, arg) && !got_int) { *************** *** 1193,1199 **** if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg)) { emsg_severe = TRUE; ! if (!error) semsg(_(e_trailing_arg), arg); break; } --- 1194,1200 ---- if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg)) { emsg_severe = TRUE; ! if (uncaught_emsg == prev_uncaught_emsg) semsg(_(e_trailing_arg), arg); break; } *** ../vim-8.2.3341/src/testdir/test_let.vim 2021-06-26 15:00:55.881276189 +0200 --- src/testdir/test_let.vim 2021-08-14 14:17:36.288718007 +0200 *************** *** 279,285 **** let l = [1, 2, 3] call assert_fails('let l[:] = 5', 'E709:') ! call assert_fails('let x:lnum=5', ['E121:', 'E488:']) call assert_fails('let v:=5', 'E461:') call assert_fails('let [a]', 'E474:') call assert_fails('let [a, b] = [', 'E697:') --- 279,285 ---- let l = [1, 2, 3] call assert_fails('let l[:] = 5', 'E709:') ! call assert_fails('let x:lnum=5', ['E121:', 'E121:']) call assert_fails('let v:=5', 'E461:') call assert_fails('let [a]', 'E474:') call assert_fails('let [a, b] = [', 'E697:') *** ../vim-8.2.3341/src/version.c 2021-08-14 14:00:58.233863891 +0200 --- src/version.c 2021-08-14 14:18:45.724598055 +0200 *************** *** 757,758 **** --- 757,760 ---- { /* Add new patch number below this line */ + /**/ + 3342, /**/ -- TIM: That is not an ordinary rabbit ... 'tis the most foul cruel and bad-tempered thing you ever set eyes on. ROBIN: You tit. I soiled my armour I was so scared! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///