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 <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/version.c b/src/version.c
index 5b29fc0bdbe47a58f7ed92560960ce4203cd8673..063e0a2ed66952364413cac9c5575aae3c00b410 100644 (file)
--- 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 f624e9e9512a8f66bc94929bfd2b806ef7d809cb..cee40b79e6518bc2e1f26aff0fbda3c382a0dab0 100644 (file)
--- 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);
        }