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 336157c..38ae0b4 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -866,7 +866,11 @@
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 d2554e2..850fd06 100644
--- a/src/search.c
+++ b/src/search.c
@@ -567,7 +567,9 @@
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 f9fea1c..1824903 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 991,
+/**/
990,
/**/
989,