changeset 13458:0e7a56b18d61 v8.0.1603

patch 8.0.1603: cannot build with +terminal but without +menu commit https://github.com/vim/vim/commit/f118d4847eb0dc2473260aebce301643568c5bc3 Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Tue, 13 Mar 2018 13:15:07 +0100
parents 83319c33df2c
children 4879a00cec7f
files src/terminal.c src/version.c
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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,