thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0825: compile error for non-diff builds

Browse Source 
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>
This commit is contained in:
John Marriott
2024-10-31 10:53:43 +01:00
committed by Christian Brabandt
parent 4d618006ec
commit 69f85c6506
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/evalfunc.c
View File

@@ -8359,15 +8359,19 @@ f_line(typval_T *argvars, typval_T *rettv)
{ {
if (switch_win_noblock(&switchwin, wp, tp, TRUE) == OK) if (switch_win_noblock(&switchwin, wp, tp, TRUE) == OK)
{ {
#ifdef FEAT_DIFF
// in diff mode, prevent that the window scrolls // in diff mode, prevent that the window scrolls
// and keep the topline // and keep the topline
if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff) if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff)
skip_update_topline = TRUE; skip_update_topline = TRUE;
#endif
check_cursor(); check_cursor();
fp = var2fpos(&argvars[0], TRUE, &fnum, FALSE); fp = var2fpos(&argvars[0], TRUE, &fnum, FALSE);
} }
#ifdef FEAT_DIFF
if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff) if (curwin->w_p_diff && switchwin.sw_curwin->w_p_diff)
skip_update_topline = FALSE; skip_update_topline = FALSE;
#endif
restore_win_noblock(&switchwin, TRUE); restore_win_noblock(&switchwin, TRUE);
} }
} }

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
825,
/**/ /**/
824, 824,
/**/ /**/