diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-07-17 20:06:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-17 12:06:59 +0000 |
| commit | 5d7fd74397a9fb96bc9d1f72c402884b51255bf2 (patch) | |
| tree | 79549bea89fee304a3ae6b81e575fd811b049d1c | |
| parent | 05dcda8f9b0583505327692570a2cfd0225124dc (diff) | |
| download | rneovim-5d7fd74397a9fb96bc9d1f72c402884b51255bf2.tar.gz rneovim-5d7fd74397a9fb96bc9d1f72c402884b51255bf2.tar.bz2 rneovim-5d7fd74397a9fb96bc9d1f72c402884b51255bf2.zip | |
vim-patch:8.1.1588: in :let-heredoc line continuation is recognized (#29767)
Problem: In :let-heredoc line continuation is recognized.
Solution: Do not consume line continuation. (Ozaki Kiichi, closes vim/vim#4580)
https://github.com/vim/vim/commit/e96a2498f9a2d3e93ac07431f6d4afd77f30afdf
Nvim already sets may_garbage_collect to false in nv_event(), so the
timer change isn't needed.
Other changes have already been ported.
Also fix incorrect port of test in patch 8.1.1356.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | test/old/testdir/test_let.vim | 20 | ||||
| -rw-r--r-- | test/old/testdir/test_startup.vim | 1 |
2 files changed, 15 insertions, 6 deletions
diff --git a/test/old/testdir/test_let.vim b/test/old/testdir/test_let.vim index d37af45aaa..44852c1d38 100644 --- a/test/old/testdir/test_let.vim +++ b/test/old/testdir/test_let.vim @@ -521,12 +521,12 @@ END END call assert_equal(['vim', '', 'end', ' END', 'END '], var3) - let var1 =<< trim END - Line1 - Line2 - Line3 - END - END + let var1 =<< trim END + Line1 + Line2 + Line3 + END + END call assert_equal(['Line1', ' Line2', "\tLine3", ' END'], var1) let var1 =<< trim !!! @@ -563,6 +563,14 @@ END END call assert_equal(['something', 'endfunc'], var1) + " not concatenate lines + let var1 =<< END +some + \thing + \ else +END + call assert_equal(['some', ' \thing', ' \ else'], var1) + " ignore "python << xx" let var1 =<<END something diff --git a/test/old/testdir/test_startup.vim b/test/old/testdir/test_startup.vim index db9f0c4c13..c80d98925a 100644 --- a/test/old/testdir/test_startup.vim +++ b/test/old/testdir/test_startup.vim @@ -163,6 +163,7 @@ endfunc " horizontally or vertically. func Test_o_arg() let after =<< trim [CODE] + set cpo&vim call writefile([winnr("$"), \ winheight(1), winheight(2), &lines, \ winwidth(1), winwidth(2), &columns, |