changeset 14341:3224a9aebc46 v8.1.0186

patch 8.1.0186: test for getwininfo() fails in GUI commit https://github.com/vim/vim/commit/44a693a1bdfe987edb649677c94c214f94b2aada Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 14 22:23:47 2018 +0200 patch 8.1.0186: test for getwininfo() fails in GUI Problem: Test for getwininfo() fails in GUI. Solution: Account for missing tabline.
author Christian Brabandt <cb@256bit.org>
date Sat, 14 Jul 2018 22:30:05 +0200
parents fbfaffe10405
children a9a24e84d02d
files src/testdir/test_bufwintabinfo.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_bufwintabinfo.vim
+++ b/src/testdir/test_bufwintabinfo.vim
@@ -53,15 +53,16 @@ function Test_getbufwintabinfo()
     call assert_equal(5, len(winlist))
     call assert_equal(winwidth(1), winlist[0].width)
     call assert_equal(0, winlist[0].wincol)
-    call assert_equal(1, winlist[0].winrow)  " tabline adds one
+    let tablineheight = winlist[0].winrow == 1 ? 1 : 0
+    call assert_equal(tablineheight, winlist[0].winrow)  " tabline adds one
 
     call assert_equal(winbufnr(2), winlist[1].bufnr)
     call assert_equal(winheight(2), winlist[1].height)
     call assert_equal(0, winlist[1].wincol)
-    call assert_equal(winheight(1) + 2, winlist[1].winrow)
+    call assert_equal(tablineheight + winheight(1) + 1, winlist[1].winrow)
 
     call assert_equal(1, winlist[2].winnr)
-    call assert_equal(1, winlist[2].winrow)
+    call assert_equal(tablineheight, winlist[2].winrow)
     call assert_equal(0, winlist[2].wincol)
 
     call assert_equal(winlist[2].width + 1, winlist[3].wincol)
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    186,
+/**/
     185,
 /**/
     184,