diff options
Diffstat (limited to 'src/nvim/window.c')
| -rw-r--r-- | src/nvim/window.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 530cbc0c7b..63a6eb9fb6 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2048,7 +2048,7 @@ static int get_maximum_wincount(frame_T *fr, int height) } /// Make all windows the same height. -///'next_curwin' will soon be the current window, make sure it has enough rows. +/// 'next_curwin' will soon be the current window, make sure it has enough rows. /// /// @param next_curwin pointer to current window to be or NULL /// @param current do only frame with current window @@ -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) { @@ -5524,7 +5525,7 @@ static void frame_setheight(frame_T *curfrp, int height) } frame_setheight(curfrp->fr_parent, height + frame_minheight(curfrp->fr_parent, NOWIN) - (int)p_wmh - 1); - //NOTREACHED + // NOTREACHED } // Compute the number of lines we will take from others frames (can be @@ -6270,12 +6271,6 @@ void command_height(void) // p_ch was changed in another tab page. curtab->tp_ch_used = p_ch; - // If the space for the command line is already more than 'cmdheight' there - // is nothing to do (window size must have decreased). - if (p_ch > old_p_ch && cmdline_row <= Rows - p_ch) { - return; - } - // If cmdline_row is smaller than what it is supposed to be for 'cmdheight' // then set old_p_ch to what it would be, so that the windows get resized // properly for the new value. |