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
index c94dd1198e6d42222fab4226fee4732722c767ac..f3c364451e95d6919a42b143fd629c10f0b76cb5 100644 (file)
--- 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 b24748a9b11ac8b3e52992dd70119c7935831a39..b84c9f5a78605d799b38da73216f5fd3b13aa838 100644 (file)
--- 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,
 /**/