diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-03 14:42:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-03 14:42:11 +0100 |
| commit | 975880b6e6de473b512995ef87ce072aaca934cf (patch) | |
| tree | d13ee3177bfa632013b01ff00c93315f8dbbb2ce | |
| parent | e21c1580b7acb598a6e3c38565434fe5d0e2ad7a (diff) | |
| download | vim-git-975880b6e6de473b512995ef87ce072aaca934cf.tar.gz | |
patch 8.1.0991: cannot build with a mix of featuresv8.1.0991
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)
| -rw-r--r-- | src/diff.c | 6 | ||||
| -rw-r--r-- | src/search.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
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 @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 991, +/**/ 990, /**/ 989, |