diff options
| author | John Marriott <basilisk@internode.on.net> | 2024-10-31 10:53:43 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-10-31 10:54:10 +0100 |
| commit | 69f85c65061342846837f91f983bcca148c9c977 (patch) | |
| tree | 7c406b2cbbd9f824c1e3425900e18db11f1da297 | |
| parent | 4d618006ecfd2557806d8af488f70b3e46878d70 (diff) | |
patch 9.1.0825: compile error for non-diff buildsv9.1.0825
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>
| -rw-r--r-- | src/evalfunc.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index f6a3f9d919..adae129480 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 b210321391..891327afdd 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 825, +/**/ 824, /**/ 823, |