From 25a6df90dfbed93963407e02f5e207abe2b2c68f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 6 Apr 2013 14:29:00 +0200 Subject: [PATCH] updated for version 7.3.883 Problem: Can't build with some combination of features. Solution: Adjust #ifdefs. --- src/ex_getln.c | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ex_getln.c b/src/ex_getln.c index c94dd1198e6d42..f3c364451e95d6 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -114,13 +114,15 @@ static int expand_shellcmd __ARGS((char_u *filepat, int *num_file, char_u ***fil 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 index b24748a9b11ac8..b84c9f5a78605d 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 883, /**/ 882, /**/