# HG changeset patch # User Christian Brabandt # Date 1505852107 -7200 # Node ID b0fc1cdec2da3b605c4821596be2dd4e1bc18102 # Parent d91cf2e26ef0c5605edc0cd8221ebda3233a3b93 patch 8.0.1129: window toolbar missing a part of the patch commit https://github.com/vim/vim/commit/a5a2be26febee62da480265ed9a52f782d5b4388 Author: Bram Moolenaar Date: Tue Sep 19 22:08:04 2017 +0200 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 --- 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 --- a/src/vim.h +++ b/src/vim.h @@ -864,7 +864,11 @@ extern int (*dyn_libintl_putenv)(const c #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