0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 7.4.1613

Problem:    Still can't build with small features.
Solution:   Adjust #ifdefs.
This commit is contained in:
Bram Moolenaar
2016-03-19 22:50:43 +01:00
parent d293b2b9d4
commit 064154c3fe
2 changed files with 10 additions and 2 deletions

View File

@@ -5861,7 +5861,7 @@ remove_key_from_history(void)
#endif /* FEAT_CMDHIST */ #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 * Get pointer to the command line info to use. cmdline_paste() may clear
* ccline and put the previous value in prev_ccline. * ccline and put the previous value in prev_ccline.
@@ -5877,7 +5877,9 @@ get_ccline_ptr(void)
return &prev_ccline; return &prev_ccline;
return NULL; return NULL;
} }
#endif
#if defined(FEAT_EVAL) || defined(PROTO)
/* /*
* Get the current command line in allocated memory. * Get the current command line in allocated memory.
* Only works when the command line is being edited. * Only works when the command line is being edited.
@@ -5948,7 +5950,11 @@ get_cmdline_type(void)
if (p == NULL) if (p == NULL)
return NUL; return NUL;
if (p->cmdfirstc == NUL) if (p->cmdfirstc == NUL)
return (p->input_fn) ? '@' : '-'; return
# ifdef FEAT_EVAL
(p->input_fn) ? '@' :
# endif
'-';
return p->cmdfirstc; return p->cmdfirstc;
} }
#endif #endif

View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1613,
/**/ /**/
1612, 1612,
/**/ /**/