patch 9.2.0148: Compile error when FEAT_DIFF is not defined
Commit:
https://github.com/vim/vim/commit/9f983a95605b42dbdc4a8c0f95584a72fc33deeb
Author: John Marriott <[email protected]>
Date: Thu Mar 12 21:27:58 2026 +0000
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/version.c b/src/version.c
index 5b29fc0bd..063e0a2ed 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 f624e9e95..cee40b79e 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);
}
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1w0nq3-002LGL-3X%40256bit.org.
