To: vim_dev@googlegroups.com Subject: Patch 8.1.2154 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2154 Problem: Quickfix window height wrong when there is a tabline. (Daniel Hahler) Solution: Take the tabline height into account. (closes #5058) Files: src/quickfix.c, src/testdir/test_quickfix.vim *** ../vim-8.1.2153/src/quickfix.c 2019-09-03 23:20:00.929446231 +0200 --- src/quickfix.c 2019-10-16 14:50:34.952930439 +0200 *************** *** 4046,4053 **** if (sz != win->w_width) win_setwidth(sz); } ! else if (sz != win->w_height ! && win->w_height + win->w_status_height < cmdline_row) win_setheight(sz); } --- 4046,4053 ---- if (sz != win->w_width) win_setwidth(sz); } ! else if (sz != win->w_height && win->w_height ! + win->w_status_height + tabline_height() < cmdline_row) win_setheight(sz); } *** ../vim-8.1.2153/src/testdir/test_quickfix.vim 2019-09-15 19:09:17.739668187 +0200 --- src/testdir/test_quickfix.vim 2019-10-16 14:43:14.722716336 +0200 *************** *** 297,302 **** --- 297,314 ---- quit endfunc + func Test_copenHeight_tabline() + set tabline=foo showtabline=2 + copen + wincmd H + let height = winheight(0) + copen 10 + call assert_equal(height, winheight(0)) + quit + set tabline& showtabline& + endfunc + + " Tests for the :cfile, :lfile, :caddfile, :laddfile, :cgetfile and :lgetfile " commands. func XfileTests(cchar) *** ../vim-8.1.2153/src/version.c 2019-10-16 14:38:01.916048915 +0200 --- src/version.c 2019-10-16 14:44:28.646410873 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 2154, /**/ -- No children may attend school with their breath smelling of "wild onions." [real standing law in West Virginia, United States of America] /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///