# HG changeset patch # User Christian Brabandt # Date 1458424805 -3600 # Node ID 59866aabe7372391228ab18e8b2528be92ef9197 # Parent 2cebcdc44e2073175030ad6b33094118bbed7c5d commit https://github.com/vim/vim/commit/064154c3fedd6a46ca2f61463d7e5567bd22d9f1 Author: Bram Moolenaar Date: Sat Mar 19 22:50:43 2016 +0100 patch 7.4.1613 Problem: Still can't build with small 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 @@ -5861,7 +5861,7 @@ remove_key_from_history(void) #endif /* FEAT_CMDHIST */ -#if defined(FEAT_EVAL) || defined(PROTO) +#if defined(FEAT_EVAL) || defined(FEAT_CMDWIN) || defined(PROTO) /* * Get pointer to the command line info to use. cmdline_paste() may clear * ccline and put the previous value in prev_ccline. @@ -5877,7 +5877,9 @@ get_ccline_ptr(void) return &prev_ccline; return NULL; } - +#endif + +#if defined(FEAT_EVAL) || defined(PROTO) /* * Get the current command line in allocated memory. * Only works when the command line is being edited. @@ -5948,7 +5950,11 @@ get_cmdline_type(void) if (p == NULL) return NUL; if (p->cmdfirstc == NUL) - return (p->input_fn) ? '@' : '-'; + return +# ifdef FEAT_EVAL + (p->input_fn) ? '@' : +# endif + '-'; return p->cmdfirstc; } #endif diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1613, +/**/ 1612, /**/ 1611,