summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-12 21:12:43 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-12 21:12:43 +0200
commit85dad2c815aaef69aa948fb17874b3825dd72def (patch)
treed8b040064def5ab2bc63b3b73effdaf189ab2783
parent8603356bf41e4aa5fe1d7cffe3ee003745c167a6 (diff)
patch 8.0.0711: cannot build without the wildmenu featurev8.0.0711
Problem: Cannot build without the wildmenu feature. Solution: Add #ifdef
-rw-r--r--src/screen.c8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 5a360b5ff1..a7e881e368 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -275,10 +275,12 @@ redraw_buf_and_status_later(buf_T *buf, int type)
{
win_T *wp;
+#ifdef FEAT_WILDMENU
if (wild_menu_showing != 0)
/* Don't redraw while the command line completion is displayed, it
* would disappear. */
return;
+#endif
FOR_ALL_WINDOWS(wp)
{
if (wp->w_buffer == buf)
@@ -450,7 +452,11 @@ redraw_after_callback(void)
{
/* Redrawing only works when the screen didn't scroll. Don't clear
* wildmenu entries. */
- if (msg_scrolled == 0 && wild_menu_showing == 0)
+ if (msg_scrolled == 0
+#ifdef FEAT_WILDMENU
+ && wild_menu_showing == 0
+#endif
+ )
update_screen(0);
/* Redraw in the same position, so that the user can continue
* editing the command. */
diff --git a/src/version.c b/src/version.c
index 02ce657ea0..6d448ae240 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 711,
+/**/
710,
/**/
709,