commit a5a2be26febee62da480265ed9a52f782d5b4388
author Bram Moolenaar <Bram@vim.org> Tue Sep 19 22:08:04 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Sep 19 22:08:04 2017 +0200
tree 49b9d16ef1eab1aeaa04d938e230e4a92d82846c
parent 37c64c78fd87e086b5a945ad7032787c274e2dcb

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.

src/version.c

diff --git a/src/version.c b/src/version.c
index 1deaca8..8411fb0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1129,
+/**/
     1128,
 /**/
     1127,

src/vim.h

diff --git a/src/vim.h b/src/vim.h
index f497cbc..cb771ff 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -864,7 +864,11 @@
 #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