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>

diff --git a/src/evalfunc.c b/src/evalfunc.c
index f6a3f9d919806aa90bc5341e3278a00706705378..adae129480def92f765ebd1da467049981e76ce2 100644 (file)
--- 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 b210321391e5ea6e832ea134b5b7756c8dd6a2ff..891327afdde589478b4eea7a68d2820dce5c47d4 100644 (file)
--- 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,
 /**/