To: vim_dev@googlegroups.com Subject: Patch 8.2.1075 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1075 Problem: Vim9: no line break allowed in :echo expression. Solution: Skip linebreak. Files: src/eval.c, src/testdir/test_vim9_cmd.vim *** ../vim-8.2.1074/src/eval.c 2020-06-27 21:17:55.359214424 +0200 --- src/eval.c 2020-06-27 21:50:42.850114096 +0200 *************** *** 5190,5195 **** --- 5190,5196 ---- CLEAR_FIELD(evalarg); evalarg.eval_flags = eap->skip ? 0 : EVAL_EVALUATE; + evalarg.eval_cookie = eap->getline == getsourceline ? eap->cookie : NULL; if (eap->skip) ++emsg_skip; *** ../vim-8.2.1074/src/testdir/test_vim9_cmd.vim 2020-05-10 21:47:40.152613769 +0200 --- src/testdir/test_vim9_cmd.vim 2020-06-27 21:55:18.544699676 +0200 *************** *** 78,82 **** --- 78,105 ---- assert_equal({'0': 0, '1': 1, '2': 2}, nrd) enddef + def Test_echo_linebreak() + let lines =<< trim END + vim9script + redir @a + echo 'one' + .. 'two' + redir END + assert_equal("\nonetwo", @a) + END + CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + redir @a + echo 11 + + 77 + - 22 + redir END + assert_equal("\n66", @a) + END + CheckScriptSuccess(lines) + enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker *** ../vim-8.2.1074/src/version.c 2020-06-27 21:17:55.363214407 +0200 --- src/version.c 2020-06-27 21:52:22.357667527 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1075, /**/ -- Why is "abbreviation" such a long word? /// 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 ///