patch 9.1.0825: compile error for non-diff builds
Commit:
https://github.com/vim/vim/commit/69f85c65061342846837f91f983bcca148c9c977
Author: John Marriott <basil...@internode.on.net>
Date: Thu Oct 31 10:53:43 2024 +0100
patch 9.1.0825: compile error for non-diff builds
Problem: compile error for non-diff builds
(after v9.1.0822)
Solution: Add #ifdef FEAT_DIFF (John Marriott)
Signed-off-by: John Marriott <basil...@internode.on.net>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/evalfunc.c b/src/evalfunc.c
index f6a3f9d91..adae12948 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -8359,15 +8359,19 @@ f_line(typval_T *argvars, typval_T *rettv)
{
if (switch_win_noblock(&switchwin, wp, tp, TRUE) == OK)
{
+#ifdef FEAT_DIFF
// in diff mode, prevent that the window scrolls
// and keep the topline
if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff)
skip_update_topline = TRUE;
+#endif
check_cursor();
fp = var2fpos(&argvars[0], TRUE, &fnum, FALSE);
}
+#ifdef FEAT_DIFF
if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff)
skip_update_topline = FALSE;
+#endif
restore_win_noblock(&switchwin, TRUE);
}
}
diff --git a/src/version.c b/src/version.c
index b21032139..891327afd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 825,
/**/
824,
/**/
--
--
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 vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1t6RyG-002w4C-Ke%40256bit.org.
