From 9f983a95605b42dbdc4a8c0f95584a72fc33deeb Mon Sep 17 00:00:00 2001 From: John Marriott Date: Thu, 12 Mar 2026 21:27:58 +0000 Subject: [PATCH] patch 9.2.0148: Compile error when FEAT_DIFF is not defined Problem: Compile error when FEAT_DIFF is not defined (after v9.2.0144) Solution: Add ifdefs around those lines (John Marriott). related: #19622 Signed-off-by: John Marriott Signed-off-by: Christian Brabandt --- src/version.c | 2 ++ src/window.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/version.c b/src/version.c index 5b29fc0bdb..063e0a2ed6 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 */ +/**/ + 148, /**/ 147, /**/ diff --git a/src/window.c b/src/window.c index f624e9e951..cee40b79e6 100644 --- a/src/window.c +++ b/src/window.c @@ -7748,10 +7748,14 @@ frame_change_statusline_height_rec(frame_T *frp, int global_stlh) // and let update_topline() handle cursor visibility for // curwin during redraw. linenr_T saved_topline = wp->w_topline; +# ifdef FEAT_DIFF int saved_topfill = wp->w_topfill; +# endif win_new_height(wp, win_free_height - wp->w_status_height); wp->w_topline = saved_topline; +# ifdef FEAT_DIFF wp->w_topfill = saved_topfill; +# endif wp->w_valid &= ~(VALID_WROW | VALID_CROW | VALID_BOTLINE | VALID_BOTLINE_AP); }