Skip to content

Commit 69f85c6

Browse files
John Marriottchrisbra
authored andcommitted
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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 4d61800 commit 69f85c6

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

src/evalfunc.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8359,15 +8359,19 @@ f_line(typval_T *argvars, typval_T *rettv)
83598359
{
83608360
if (switch_win_noblock(&switchwin, wp, tp, TRUE) == OK)
83618361
{
8362+
#ifdef FEAT_DIFF
83628363
// in diff mode, prevent that the window scrolls
83638364
// and keep the topline
83648365
if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff)
83658366
skip_update_topline = TRUE;
8367+
#endif
83668368
check_cursor();
83678369
fp = var2fpos(&argvars[0], TRUE, &fnum, FALSE);
83688370
}
8371+
#ifdef FEAT_DIFF
83698372
if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff)
83708373
skip_update_topline = FALSE;
8374+
#endif
83718375
restore_win_noblock(&switchwin, TRUE);
83728376
}
83738377
}

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
825,
707709
/**/
708710
824,
709711
/**/

0 commit comments

Comments
 (0)