]> granicus.if.org Git - vim/commitdiff
patch 8.1.0991: cannot build with a mix of features v8.1.0991
authorBram Moolenaar <Bram@vim.org>
Sun, 3 Mar 2019 13:42:11 +0000 (14:42 +0100)
committerBram Moolenaar <Bram@vim.org>
Sun, 3 Mar 2019 13:42:11 +0000 (14:42 +0100)
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)

src/diff.c
src/search.c
src/version.c

index 336157c6d92c722f2f1ebfa6cfd4cb2ac2fda5b4..38ae0b47c92aea327727e9f41412f0fbb9213014 100644 (file)
@@ -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
+       ;
 }
 
 /*
index d2554e2d99b7b8ac49c79a643c980d194e8db766..850fd06c718d8efad92feb7f8ccac65a855851a7 100644 (file)
@@ -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. */
index f9fea1c03e025a4c05e873717c8a3427d0c3efcc..1824903a948ae7c89806826ec382bc7eb8516ce2 100644 (file)
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    991,
 /**/
     990,
 /**/