diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-27 21:56:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-27 21:56:17 +0200 |
| commit | 7e8967fdcdf45caf08753bb791dc3779e78b34c8 (patch) | |
| tree | 0bc241641288c757993ffe97bf1c39fa955941fe | |
| parent | 9215f01218b2ed2cfe49c1f43fcf342bd9ffdded (diff) | |
patch 8.2.1075: Vim9: no line break allowed in :echo expressionv8.2.1075
Problem: Vim9: no line break allowed in :echo expression.
Solution: Skip linebreak.
| -rw-r--r-- | src/eval.c | 1 | ||||
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index ca98d2eb02..736023930b 100644 --- a/src/eval.c +++ b/src/eval.c @@ -5190,6 +5190,7 @@ ex_echo(exarg_T *eap) 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; diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 55d756a676..2d5bf4516e 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -78,5 +78,28 @@ def Test_assign_dict() 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 diff --git a/src/version.c b/src/version.c index dc05521890..c304fe5ccf 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1075, +/**/ 1074, /**/ 1073, |