From 006334f3a7014d5d23df617ed619377464d4956f Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 17 Jul 2022 12:21:39 +0800 Subject: vim-patch:8.2.2427: can still switch windows for 'completefunc' Problem: Can still switch windows for 'completefunc'. Solution: Also disallow switching windows for other completions. https://github.com/vim/vim/commit/3eb6bd9c2b36dcce471bfb543c8d5488f1dc17a4 Assert E565 instead of E578. Need to assert a different string because patch 8.2.1919 hasn't been ported yet. --- src/nvim/testdir/test_ins_complete.vim | 2 +- src/nvim/testdir/test_popup.vim | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/nvim/testdir') diff --git a/src/nvim/testdir/test_ins_complete.vim b/src/nvim/testdir/test_ins_complete.vim index 563d8812f7..93ab17955d 100644 --- a/src/nvim/testdir/test_ins_complete.vim +++ b/src/nvim/testdir/test_ins_complete.vim @@ -614,7 +614,7 @@ func Test_completefunc_error() endfunc set completefunc=CompleteFunc call setline(1, ['', 'abcd', '']) - call assert_fails('exe "normal 2G$a\\"', 'E840:') + call assert_fails('exe "normal 2G$a\\"', 'E565:') " delete text when called for the second time func CompleteFunc2(findstart, base) diff --git a/src/nvim/testdir/test_popup.vim b/src/nvim/testdir/test_popup.vim index aef32fc504..a5e4be49f4 100644 --- a/src/nvim/testdir/test_popup.vim +++ b/src/nvim/testdir/test_popup.vim @@ -382,11 +382,11 @@ func Test_completefunc_opens_new_window_two() setlocal completefunc=DummyCompleteTwo call setline(1, 'two') /^two - call assert_fails('call feedkeys("A\\\\", "x")', 'E764:') - call assert_notequal(winid, win_getid()) - q! + call assert_fails('call feedkeys("A\\\\", "x")', 'E565:') call assert_equal(winid, win_getid()) - call assert_equal('two', getline(1)) + " v8.2.1919 hasn't been ported yet + " call assert_equal('twodef', getline(1)) + call assert_equal('twoDEF', getline(1)) q! endfunc -- cgit