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.
vim · Sep 19, 2017 · a5a2be2 · a5a2be2
1 parent 37c64c7
commit a5a2be2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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