Mercurial > vim
changeset 15971:ced614446eaa v8.1.0991
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)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 03 Mar 2019 14:45:06 +0100 |
parents | 4b4561a386cd |
children | 1b570dab3589 |
files | src/diff.c src/search.c src/version.c |
diffstat | 3 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 + ; } /*
--- 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. */