Mercurial > vim
changeset 36426:88644bd3e9ae draft v9.1.0825
patch 9.1.0825: compile error for non-diff builds
Commit: https://github.com/vim/vim/commit/69f85c65061342846837f91f983bcca148c9c977
Author: John Marriott <basilisk@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 <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 31 Oct 2024 11:00:04 +0100 |
| parents | 8d1d23883760 |
| children | 155b0ef255e8 |
| files | src/evalfunc.c src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -8359,15 +8359,19 @@ f_line(typval_T *argvars, typval_T *rett { 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); } }