Commit: patch 9.2.0103: missing FEAT_MENU guard for w_winbar_height in window.c

[Christian Brabandt]

patch 9.2.0103: missing FEAT_MENU guard for w_winbar_height in window.c

Commit: https://github.com/vim/vim/commit/ff9185e8225fc66449eb63bec34e56e239cca217
Author: Hirohito Higashi <h.eas...@gmail.com>
Date: Tue Mar 3 20:13:53 2026 +0000

patch 9.2.0103: missing FEAT_MENU guard for w_winbar_height in window.c

Problem: missing FEAT_MENU guard for w_winbar_height in window.c
(Char, after v9.2.0083)
Solution: Use WINBAR_HEIGHT() macro (Hirohito Higashi)

fixes: #19556
closes: #19560

Signed-off-by: Hirohito Higashi <h.eas...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/version.c b/src/version.c
index 45c76d267..17088a487 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 103,
/**/
102,
/**/
diff --git a/src/window.c b/src/window.c
index 694c2c029..a925fcc03 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7660,22 +7660,21 @@ frame_change_statusline_height_rec(frame_T *frp, bool actual_change)

if (wp->w_height > 0 && wp->w_status_height > 0)
{
+ int win_free_height = frp->fr_height - WINBAR_HEIGHT(wp);
+
if (actual_change)
{
wp->w_status_height = stlo_mh;
- if (wp->w_status_height > frp->fr_height - wp->w_winbar_height
- - p_wmh)
+ if (wp->w_status_height > win_free_height - p_wmh)
{
- wp->w_status_height = frp->fr_height - wp->w_winbar_height
- - p_wmh;
+ wp->w_status_height = win_free_height - p_wmh;
}
- win_new_height(wp, frp->fr_height - wp->w_status_height
- - wp->w_winbar_height);
+ win_new_height(wp, win_free_height - wp->w_status_height);
}
else
{
- if (frp->fr_height - wp->w_winbar_height - p_wmh < stlh_effort)
- stlh_effort = frp->fr_height - wp->w_winbar_height - p_wmh;
+ if (win_free_height - p_wmh < stlh_effort)
+ stlh_effort = win_free_height - p_wmh;
}
}
}