0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

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)
This commit is contained in:
Bram Moolenaar
2019-03-03 14:42:11 +01:00
parent e21c1580b7
commit 975880b6e6
3 changed files with 9 additions and 1 deletions

View File

@@ -866,7 +866,11 @@ theend:
int int
diff_internal(void) 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
;
} }
/* /*

View File

@@ -567,7 +567,9 @@ set_last_search_pat(
saved_spats[idx].pat = NULL; saved_spats[idx].pat = NULL;
else else
saved_spats[idx].pat = vim_strsave(spats[idx].pat); saved_spats[idx].pat = vim_strsave(spats[idx].pat);
# ifdef FEAT_SEARCH_EXTRA
saved_spats_last_idx = last_idx; saved_spats_last_idx = last_idx;
# endif
} }
# ifdef FEAT_SEARCH_EXTRA # ifdef FEAT_SEARCH_EXTRA
/* If 'hlsearch' set and search pat changed: need redraw. */ /* If 'hlsearch' set and search pat changed: need redraw. */

View File

@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
991,
/**/ /**/
990, 990,
/**/ /**/