patch 8.0.1603: cannot build with +terminal but without +menu

Problem: Cannot build with +terminal but without +menu. Solution: Add #ifdef. (Damien)
vim · Mar 13, 2018 · f118d48 · f118d48
1 parent 625f0c1
commit f118d48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1603,
 /**/
     1602,
 /**/