commit 7e8967fdcdf45caf08753bb791dc3779e78b34c8
author Bram Moolenaar <Bram@vim.org> Sat Jun 27 21:56:17 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jun 27 21:56:17 2020 +0200
tree 0bc241641288c757993ffe97bf1c39fa955941fe
parent 9215f01218b2ed2cfe49c1f43fcf342bd9ffdded

patch 8.2.1075: Vim9: no line break allowed in :echo expression

Problem:    Vim9: no line break allowed in :echo expression.
Solution:   Skip linebreak.

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index ca98d2e..7360239 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5190,6 +5190,7 @@
 
     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;

src/testdir/test_vim9_cmd.vim

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 55d756a..2d5bf45 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -78,5 +78,28 @@
   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

src/version.c

diff --git a/src/version.c b/src/version.c
index dc05521..c304fe5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1075,
+/**/
     1074,
 /**/
     1073,