# HG changeset patch # User Christian Brabandt # Date 1520943307 -3600 # Node ID 0e7a56b18d612fb46419e4abaef5bf1908963e79 # Parent 83319c33df2c41109e882caf27edd56706b688d7 patch 8.0.1603: cannot build with +terminal but without +menu commit https://github.com/vim/vim/commit/f118d4847eb0dc2473260aebce301643568c5bc3 Author: Bram Moolenaar Date: Tue Mar 13 13:14:00 2018 +0100 patch 8.0.1603: cannot build with +terminal but without +menu Problem: Cannot build with +terminal but without +menu. Solution: Add #ifdef. (Damien) diff --git a/src/terminal.c b/src/terminal.c --- 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 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1603, +/**/ 1602, /**/ 1601,