From f118d4847eb0dc2473260aebce301643568c5bc3 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 13 Mar 2018 13:14:00 +0100 Subject: [PATCH] patch 8.0.1603: cannot build with +terminal but without +menu Problem: Cannot build with +terminal but without +menu. Solution: Add #ifdef. (Damien) --- src/terminal.c | 7 +++++-- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/terminal.c b/src/terminal.c index 43a2a317e..1bef46060 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2738,8 +2738,11 @@ term_update_window(win_T *wp) else pos.col = 0; - screen_line(wp->w_winrow + pos.row + winbar_height(wp), - wp->w_wincol, pos.col, wp->w_width, FALSE); + screen_line(wp->w_winrow + pos.row +#ifdef FEAT_MENU + + winbar_height(wp) +#endif + , wp->w_wincol, pos.col, wp->w_width, FALSE); } term->tl_dirty_row_start = MAX_ROW; term->tl_dirty_row_end = 0; diff --git a/src/version.c b/src/version.c index 2a537e6b1..d1fd6ea5f 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1603, /**/ 1602, /**/ -- 2.50.1