summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-19 22:08:04 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-19 22:08:04 +0200
commita5a2be26febee62da480265ed9a52f782d5b4388 (patch)
tree49b9d16ef1eab1aeaa04d938e230e4a92d82846c
parent37c64c78fd87e086b5a945ad7032787c274e2dcb (diff)
patch 8.0.1129: window toolbar missing a part of the patchv8.0.1129
Problem: Window toolbar missing a part of the patch. Solution: Add change in vim.h.
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 1deaca8a6f..8411fb06c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1129,
+/**/
1128,
/**/
1127,
diff --git a/src/vim.h b/src/vim.h
index f497cbccde..cb771ffc1b 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