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 1deaca8a6f7f6ba6a1df7092b41cec75ddc5a315..8411fb06c9d5b759c8a9e27c8685c5a8b23c3b72 100644 (file)
--- 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 f497cbccde273429c6a8aba3a6929564bbda42df..cb771ffc1bc618ec35f50274bc7b10cb3dbe0f52 100644 (file)
--- 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