vim-patch:9.0.0403: 'equalalways' may be off when 'laststatus' is zero (#20109)

Problem:    'equalalways' may be off when 'laststatus' is zero.
Solution:   call last_status() before win_equal(). (Luuk van Baal,
            closes https://github.com/vim/vim/pull/11070)
fd7e60a33d
This commit is contained in:
luukvbaal 2022-09-07 18:08:00 +02:00 committed by GitHub
parent 4dc4cf3467
commit ead524656d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions

View File

@ -1464,4 +1464,19 @@ func Test_win_move_statusline()
%bwipe!
endfunc
func Test_win_equal_last_status()
let save_lines = &lines
set lines=20
set splitbelow
set laststatus=0
split | split | quit
call assert_equal(winheight(1), winheight(2))
let &lines = save_lines
set splitbelow&
set laststatus&
endfunc
" vim: shiftwidth=2 sts=2 expandtab

View File

@ -2849,6 +2849,11 @@ int win_close(win_T *win, bool free_buf, bool force)
check_cursor();
}
// If last window has a status line now and we don't want one,
// remove the status line. Do this before win_equal(), because
// it may change the height of a window.
last_status(false);
if (!was_floating) {
if (!curwin->w_floating && p_ea && (*p_ead == 'b' || *p_ead == dir)) {
// If the frame of the closed window contains the new current window,
@ -2870,10 +2875,6 @@ int win_close(win_T *win, bool free_buf, bool force)
split_disallowed--;
// If last window has a status line now and we don't want one,
// remove the status line.
last_status(false);
// After closing the help window, try restoring the window layout from
// before it was opened.
if (help_window) {