diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-03-06 08:10:04 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-03-06 08:10:04 +0000 |
| commit | 30585e03a7ce6cf985f93ca30275bf4dae0d87cc (patch) | |
| tree | cdbf472db1e338235ba7363db77cab940d7f77da | |
| parent | f86dea8119f3141e3d2c680219036d1511101f9b (diff) | |
patch 9.0.1386: options test fails with some window widthv9.0.1386
Problem: Options test fails with some window width.
Solution: Adjust what text the test checks with. (closes #12111)
| -rw-r--r-- | src/testdir/test_normal.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_options.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim index 7b775fe00f..03d29ae97b 100644 --- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -2526,8 +2526,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/testdir/test_options.vim b/src/testdir/test_options.vim index b3b90d1429..e1b5622a8b 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -1058,8 +1058,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 diff --git a/src/version.c b/src/version.c index 4288f31a35..994ddb9a8c 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1386, +/**/ 1385, /**/ 1384, |