changeset 8647:59866aabe737 v7.4.1613

commit https://github.com/vim/vim/commit/064154c3fedd6a46ca2f61463d7e5567bd22d9f1 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 19 22:50:43 2016 +0100 patch 7.4.1613 Problem: Still can't build with small features. Solution: Adjust #ifdefs.
author Christian Brabandt <cb@256bit.org>
date Sat, 19 Mar 2016 23:00:05 +0100
parents 2cebcdc44e20
children 680477eae60e
files src/ex_getln.c src/version.c
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,