Skip to content

Commit 975880b

Browse files
committed
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)
1 parent e21c158 commit 975880b

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

src/diff.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,11 @@ diff_try_update(
866866
int
867867
diff_internal(void)
868868
{
869-
return (diff_flags & DIFF_INTERNAL) != 0 && *p_dex == NUL;
869+
return (diff_flags & DIFF_INTERNAL) != 0
870+
#ifdef FEAT_EVAL
871+
&& *p_dex == NUL
872+
#endif
873+
;
870874
}
871875

872876
/*

src/search.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,9 @@ set_last_search_pat(
567567
saved_spats[idx].pat = NULL;
568568
else
569569
saved_spats[idx].pat = vim_strsave(spats[idx].pat);
570+
# ifdef FEAT_SEARCH_EXTRA
570571
saved_spats_last_idx = last_idx;
572+
# endif
571573
}
572574
# ifdef FEAT_SEARCH_EXTRA
573575
/* If 'hlsearch' set and search pat changed: need redraw. */

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,8 @@ static char *(features[]) =
779779

780780
static int included_patches[] =
781781
{ /* Add new patch number below this line */
782+
/**/
783+
991,
782784
/**/
783785
990,
784786
/**/

0 commit comments

Comments
 (0)