diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-03-06 16:45:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 16:45:57 +0800 |
| commit | b0620ffe5a2e16d6d52e803978c90d0ffb030908 (patch) | |
| tree | 71d8d5a0510407a5a0c7aaa7e7c96f0cb1da75f2 | |
| parent | e389b189021cb6b72cfd7583ce6fb5d8d3346d45 (diff) | |
| download | rneovim-b0620ffe5a2e16d6d52e803978c90d0ffb030908.tar.gz rneovim-b0620ffe5a2e16d6d52e803978c90d0ffb030908.tar.bz2 rneovim-b0620ffe5a2e16d6d52e803978c90d0ffb030908.zip | |
vim-patch:9.0.1386: options test fails with some window width (#22548)
Problem: Options test fails with some window width.
Solution: Adjust what text the test checks with. (closes vim/vim#12111)
https://github.com/vim/vim/commit/30585e03a7ce6cf985f93ca30275bf4dae0d87cc
| -rw-r--r-- | src/nvim/testdir/test_normal.vim | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_options.vim | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim index 582596748f..48e6bc5298 100644 --- a/src/nvim/testdir/test_normal.vim +++ b/src/nvim/testdir/test_normal.vim @@ -2540,8 +2540,11 @@ func Test_normal33_g_cmd2() norm! g'a call assert_equal('>', a[-1:]) call assert_equal(1, line('.')) + let v:errmsg = '' call assert_nobeep("normal! g`\<Esc>") + call assert_equal('', v:errmsg) call assert_nobeep("normal! g'\<Esc>") + call assert_equal('', v:errmsg) " Test for g; and g, norm! g; diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim index 43cc3632e6..b6b982e92e 100644 --- a/src/nvim/testdir/test_options.vim +++ b/src/nvim/testdir/test_options.vim @@ -890,8 +890,9 @@ func Test_debug_option() exe "normal \<C-c>" call assert_equal('Beep!', Screenline(&lines)) call assert_equal('line 4:', Screenline(&lines - 1)) - " only match the final colon in the line that shows the source - call assert_match(':$', Screenline(&lines - 2)) + " also check a line above, with a certain window width the colon is there + call assert_match('Test_debug_option:$', + \ Screenline(&lines - 3) .. Screenline(&lines - 2)) set debug& endfunc |