summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-04-06 14:29:00 +0200
committerBram Moolenaar <bram@vim.org>2013-04-06 14:29:00 +0200
commit8302f2bd026564da5aa2ccbd86e5f337a531bef6 (patch)
treebfa939983c3f342215383c7cbe75b1c75ab0aa1c
parentb0f6ea3da6a78130018e6e2ea0c0cadad020bcfb (diff)
downloadvim-8302f2bd026564da5aa2ccbd86e5f337a531bef6.tar.gz
updated for version 7.3.883v7.3.883v7-3-883
Problem: Can't build with some combination of features. Solution: Adjust #ifdefs.
-rw-r--r--src/ex_getln.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index c94dd119..f3c36445 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 b24748a9..b84c9f5a 100644
--- 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,