From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 19 Sep 2017 20:08:04 +0000 (+0200)
Subject: patch 8.0.1129: window toolbar missing a part of the patch
X-Git-Tag: v8.0.1129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5a2be26febee62da480265ed9a52f782d5b4388;p=vim

patch 8.0.1129: window toolbar missing a part of the patch

Problem:    Window toolbar missing a part of the patch.
Solution:   Add change in vim.h.
---

diff --git a/src/version.c b/src/version.c
index 1deaca8a6..8411fb06c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1129,
 /**/
     1128,
 /**/
diff --git a/src/vim.h b/src/vim.h
index f497cbccd..cb771ffc1 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -864,7 +864,11 @@ extern int (*dyn_libintl_putenv)(const char *envstring);
 #define W_ENDCOL(wp)	(wp->w_wincol + wp->w_width)
 #define W_VSEP_WIDTH(wp) (wp->w_vsep_width)
 #define W_STATUS_HEIGHT(wp) (wp->w_status_height)
-#define W_WINROW(wp)	(wp->w_winrow)
+#ifdef FEAT_MENU
+# define W_WINROW(wp)	(wp->w_winrow + wp->w_winbar_height)
+#else
+# define W_WINROW(wp)	(wp->w_winrow)
+#endif
 
 #ifdef NO_EXPANDPATH
 # define gen_expand_wildcards mch_expand_wildcards