From: Bram Moolenaar Date: Sat, 19 Mar 2016 21:50:43 +0000 (+0100) Subject: patch 7.4.1613 X-Git-Tag: v7.4.1613 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=064154c3fedd6a46ca2f61463d7e5567bd22d9f1;p=vim 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 index 27e23c72d..8419d3f2c 100644 --- 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 index 39193addc..feedb8d21 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1613, /**/ 1612, /**/