From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 3 Mar 2019 13:42:11 +0000 (+0100)
Subject: patch 8.1.0991: cannot build with a mix of features
X-Git-Tag: v8.1.0991
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=975880b6e6de473b512995ef87ce072aaca934cf;p=vim

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
index 336157c6d..38ae0b47c 100644
--- 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
index d2554e2d9..850fd06c7 100644
--- 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
index f9fea1c03..1824903a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    991,
 /**/
     990,
 /**/