diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-08-30 14:16:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-08-30 14:16:06 +0200 |
| commit | dd5d18eadffadc723ff7d3e208a2973d267a6dde (patch) | |
| tree | 82d40099c221ff6c9c245cedc8a57a8e1a6a3408 | |
| parent | 2bf4fe07b651e2a72fcfbfdb0719b402ea0b0a10 (diff) | |
patch 8.1.0336: mkview test still fails on CIv8.1.0336
Problem: mkview test still fails on CI.
Solution: Ignore curswant, don't see another solution.
| -rw-r--r-- | src/testdir/test_mksession.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim index 426afac925..fa08685acd 100644 --- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -321,7 +321,7 @@ func Test_mkview_file() help :mkview set number norm! V}zf0 - let pos = getcurpos() + let pos = getpos('.') let linefoldclosed1 = foldclosed('.') mkview! Xview set nonumber @@ -333,7 +333,7 @@ func Test_mkview_file() source Xview call assert_equal(1, &number) call assert_match('\*:mkview\*$', getline('.')) - call assert_equal(pos, getcurpos()) + call assert_equal(pos, getpos('.')) call assert_equal(linefoldclosed1, foldclosed('.')) " Creating a view again with the same file name should fail (file @@ -356,7 +356,7 @@ func Test_mkview_loadview_with_viewdir() help :mkview set number norm! V}zf - let pos = getcurpos() + let pos = getpos('.') let linefoldclosed1 = foldclosed('.') mkview 1 set nonumber @@ -373,7 +373,7 @@ func Test_mkview_loadview_with_viewdir() \ glob('Xviewdir/*')) call assert_equal(1, &number) call assert_match('\*:mkview\*$', getline('.')) - call assert_equal(pos, getcurpos()) + call assert_equal(pos, getpos('.')) call assert_equal(linefoldclosed1, foldclosed('.')) call delete('Xviewdir', 'rf') diff --git a/src/version.c b/src/version.c index b5cfc673a4..baf005ea3e 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 336, +/**/ 335, /**/ 334, |