From: Bram Moolenaar Date: Sat, 14 Jul 2018 20:23:47 +0000 (+0200) Subject: patch 8.1.0186: test for getwininfo() fails in GUI X-Git-Tag: v8.1.0186 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44a693a1bdfe987edb649677c94c214f94b2aada;p=vim patch 8.1.0186: test for getwininfo() fails in GUI Problem: Test for getwininfo() fails in GUI. Solution: Account for missing tabline. --- diff --git a/src/testdir/test_bufwintabinfo.vim b/src/testdir/test_bufwintabinfo.vim index bcf3c52ed..d88b061ac 100644 --- 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) diff --git a/src/version.c b/src/version.c index f638db610..08e39b4d4 100644 --- a/src/version.c +++ b/src/version.c @@ -789,6 +789,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 186, /**/ 185, /**/