# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1551620706 -3600
# Node ID ced614446eaa456636354429e1ead457c30c0e2b
# Parent  4b4561a386cd2108a103542c7813704435347e40
patch 8.1.0991: cannot build with a mix of features

commit https://github.com/vim/vim/commit/975880b6e6de473b512995ef87ce072aaca934cf
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Mar 3 14:42:11 2019 +0100

    patch 8.1.0991: cannot build with a mix of features

    Problem:    Cannot build with FEAT_EVAL defined and FEAT_SEARCH_EXTRA
                undefined, and with FEAT_DIFF defined and FEAT_EVAL undefined.
    Solution:   Add a couple of #ifdefs. (closes #4067)

diff --git a/src/diff.c b/src/diff.c
--- a/src/diff.c
+++ b/src/diff.c
@@ -866,7 +866,11 @@ theend:
     int
 diff_internal(void)
 {
-    return (diff_flags & DIFF_INTERNAL) != 0 && *p_dex == NUL;
+    return (diff_flags & DIFF_INTERNAL) != 0
+#ifdef FEAT_EVAL
+	&& *p_dex == NUL
+#endif
+	;
 }
 
 /*
diff --git a/src/search.c b/src/search.c
--- a/src/search.c
+++ b/src/search.c
@@ -567,7 +567,9 @@ set_last_search_pat(
 	    saved_spats[idx].pat = NULL;
 	else
 	    saved_spats[idx].pat = vim_strsave(spats[idx].pat);
+# ifdef FEAT_SEARCH_EXTRA
 	saved_spats_last_idx = last_idx;
+# endif
     }
 # ifdef FEAT_SEARCH_EXTRA
     /* If 'hlsearch' set and search pat changed: need redraw. */
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    991,
+/**/
     990,
 /**/
     989,