From 6897ce4417a8c4832110e31b252548cb249546ad Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 23 Dec 2020 18:17:30 -0500 Subject: vim-patch:8.2.2197: assert arguments order reversed Problem: Assert arguments order reversed. Solution: Swap the arguments. (Christian Brabandt, closes vim/vim#7531) https://github.com/vim/vim/commit/9f63a65f22b6a899925ba15adbb711e86251114e --- src/nvim/testdir/test_registers.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/test_registers.vim b/src/nvim/testdir/test_registers.vim index 24e02cb385..2f72b6a4c0 100644 --- a/src/nvim/testdir/test_registers.vim +++ b/src/nvim/testdir/test_registers.vim @@ -259,9 +259,9 @@ func Test_insert_small_delete() call setline(1, ['foo foobar bar']) call cursor(1,1) exe ":norm! ciw'\-'" - call assert_equal(getline(1), "'foo' foobar bar") + call assert_equal("'foo' foobar bar", getline(1)) exe ":norm! w.w." - call assert_equal(getline(1), "'foo' 'foobar' 'bar'") + call assert_equal("'foo' 'foobar' 'bar'", getline(1)) bwipe! endfunc -- cgit From 172f619b9a834dd431f67ec46a7b4f90b4c2af52 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 23 Dec 2020 22:06:03 -0500 Subject: vim-patch:8.1.1837: popup test fails if clipboard is supported but not working Problem: Popup test fails if clipboard is supported but not working. Solution: Add the "clipboard_working" feature. Also use Check commands instead of "if" and "throw". And remove stray ch_logfile(). https://github.com/vim/vim/commit/4999a7fb6585915b53888c930067b33c01674678 Treat "clipboard_working" feature as an alias to "clipboard" feature. N/A patches for version.c: vim-patch:8.1.1840: Testing: WorkingClipboard() is not accurate Problem: Testing: WorkingClipboard() is not accurate. Solution: Check feature clipboard_working instead. https://github.com/vim/vim/commit/52992feafe8a996fbce29b97ae135abc169aa716 Neovim did not port WorkingClipboard() for the legacy tests. --- src/nvim/eval/funcs.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 89d9a85775..ed01e8a8b0 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -4206,6 +4206,8 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) n = true; } else if (STRICMP(name, "syntax_items") == 0) { n = syntax_present(curwin); + } else if (STRICMP(name, "clipboard_working") == 0) { + n = eval_has_provider("clipboard"); #ifdef UNIX } else if (STRICMP(name, "unnamedplus") == 0) { n = eval_has_provider("clipboard"); -- cgit From f35118ade40d928632fef997561a8492f35982b4 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 24 Dec 2020 00:54:19 -0500 Subject: vim-patch:8.2.0907: when using :global clipboard isn't set correctly Problem: When using :global clipboard isn't set correctly. Solution: Set "clip_unnamed_saved" instead of "clip_unnamed". (Christian Brabandt, closes vim/vim#6203, closes vim/vim#6198) https://github.com/vim/vim/commit/07188fc5ef2366a3b1952e8686a4031b44152d59 --- src/nvim/testdir/test_global.vim | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src') diff --git a/src/nvim/testdir/test_global.vim b/src/nvim/testdir/test_global.vim index bdeaf8e2cf..7ccf2812ff 100644 --- a/src/nvim/testdir/test_global.vim +++ b/src/nvim/testdir/test_global.vim @@ -1,3 +1,4 @@ +source check.vim func Test_yank_put_clipboard() new @@ -10,6 +11,16 @@ func Test_yank_put_clipboard() bwipe! endfunc +func Test_global_set_clipboard() + CheckFeature clipboard_working + new + set clipboard=unnamedplus + let @+='clipboard' | g/^/set cb= | let @" = 'unnamed' | put + call assert_equal(['','unnamed'], getline(1, '$')) + set clipboard& + bwipe! +endfunc + func Test_nested_global() new call setline(1, ['nothing', 'found', 'found bad', 'bad']) -- cgit From c56377bac65ef9cdc1562c78a5ac51b0916a3ad4 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 24 Dec 2020 09:21:33 -0500 Subject: vim-patch:8.2.2203: Moodle gift files are not recognized Problem: Moodle gift files are not recognized. Solution: Add a filetype pattern. (Delim Temizer) https://github.com/vim/vim/commit/b34f33747223d9cba4b32a27aee70c1705b36ed9 --- src/nvim/testdir/test_filetype.vim | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 356a7ce135..2123780f11 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -181,6 +181,7 @@ let s:filename_checks = { \ 'gdb': ['.gdbinit'], \ 'gdmo': ['file.mo', 'file.gdmo'], \ 'gedcom': ['file.ged', 'lltxxxxx.txt'], + \ 'gift': ['file.gift'], \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'], \ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig'], \ 'gitolite': ['gitolite.conf'], -- cgit