changeset 14646:aa48ee3d3d12 v8.1.0336

patch 8.1.0336: mkview test still fails on CI commit https://github.com/vim/vim/commit/dd5d18eadffadc723ff7d3e208a2973d267a6dde Author: Bram Moolenaar <Bram@vim.org> Date: Thu Aug 30 14:16:06 2018 +0200 patch 8.1.0336: mkview test still fails on CI Problem: mkview test still fails on CI. Solution: Ignore curswant, don't see another solution.
author Christian Brabandt <cb@256bit.org>
date Thu, 30 Aug 2018 14:30:06 +0200
parents b20684e25d7a
children 218059bfe484
files src/testdir/test_mksession.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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')
--- 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,