# HG changeset patch # User Bram Moolenaar # Date 1365251340 -7200 # Node ID 76aa34cef80f5d22bbbcf60278c833fdadd70131 # Parent 2d1383658bb4b465688a0fc587be1e354e96628d updated for version 7.3.883 Problem: Can't build with some combination of features. Solution: Adjust #ifdefs. diff --git a/src/ex_getln.c b/src/ex_getln.c --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -114,13 +114,15 @@ static int expand_shellcmd __ARGS((char_ static int ExpandRTDir __ARGS((char_u *pat, int *num_file, char_u ***file, char *dirname[])); # ifdef FEAT_CMDHIST static char_u *get_history_arg __ARGS((expand_T *xp, int idx)); -static void clear_hist_entry __ARGS((histentry_T *hisptr)); # endif # if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) static int ExpandUserDefined __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)); static int ExpandUserList __ARGS((expand_T *xp, int *num_file, char_u ***file)); # endif #endif +#ifdef FEAT_CMDHIST +static void clear_hist_entry __ARGS((histentry_T *hisptr)); +#endif #ifdef FEAT_CMDWIN static int ex_window __ARGS((void)); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 883, +/**/ 882, /**/ 881,