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
index 43a2a317e23428adc6309e1bf59a4b9e0f8e1ef5..1bef460607084ed94eea300879dc9cd9ef15e922 100644 (file)
--- 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 2a537e6b1e52bdf9e056d51251d846d157356eb2..d1fd6ea5f9149e7438ae2d1169f09ff672da4d43 100644 (file)
--- 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,
 /**/