diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-07-14 22:23:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-07-14 22:23:47 +0200 |
| commit | 44a693a1bdfe987edb649677c94c214f94b2aada (patch) | |
| tree | 320bb176faa7381776c878210b7e3ac3e38879c1 | |
| parent | 1ce9a1515be5255641d31ab5b0e9418d8f250d84 (diff) | |
patch 8.1.0186: test for getwininfo() fails in GUIv8.1.0186
Problem: Test for getwininfo() fails in GUI.
Solution: Account for missing tabline.
| -rw-r--r-- | src/testdir/test_bufwintabinfo.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_bufwintabinfo.vim b/src/testdir/test_bufwintabinfo.vim index bcf3c52ed0..d88b061ac7 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 f638db610a..08e39b4d4d 100644 --- 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, |