diff options
author | Bram Moolenaar <Bram@vim.org> | 2023-02-14 21:56:42 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-02-14 21:56:42 +0000 |
commit | fdbd14e89207dca95549f298ee468793da852086 (patch) | |
tree | a8bd851c72ad156b143405810d54e52ce8470b20 /src | |
parent | 1d6539cf36a7b6d1afe76fb6316fe662f543bf60 (diff) | |
download | vim-git-fdbd14e89207dca95549f298ee468793da852086.tar.gz |
patch 9.0.1310: 'splitkeep' test has failuresv9.0.1310
Problem: 'splitkeep' test has failures.
Solution: Adjust expected cursor line position.
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_window_cmd.vim | 11 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim index a97ccba2d..1441db584 100644 --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -1751,9 +1751,16 @@ func Test_splitkeep_options() call assert_equal(1, line("w0")) call assert_equal(curpos, getcurpos()) - " Scroll when cursor becomes invalid in insert mode + " Scroll when cursor becomes invalid in insert mode. norm Lic - call assert_equal(curpos, getcurpos()) + call assert_equal(curpos[0], getcurpos()[0], 'run ' .. run) + + " The line number might be one less because of round-off. + call assert_inrange(curpos[1] - 1, curpos[1], getcurpos()[1], 'run ' .. run) + + call assert_equal(curpos[2], getcurpos()[2], 'run ' .. run) + call assert_equal(curpos[3], getcurpos()[3], 'run ' .. run) + call assert_equal(curpos[4], getcurpos()[4], 'run ' .. run) " No scroll when topline not equal to 1 only | execute "norm gg5\<C-e>" | split | wincmd k diff --git a/src/version.c b/src/version.c index 3303bef4a..a6451cb6a 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 */ /**/ + 1310, +/**/ 1309, /**/ 1308, |