Permalink
Browse files

patch 8.0.1143: macros always expand to the same thing

Problem:    Macros always expand to the same thing.
Solution:   Remove W_VSEP_WIDTH() and W_STATUS_HEIGHT().
  • Loading branch information...
brammool committed Sep 24, 2017
1 parent 378daf8 commit e0de17d84e1612dbc9362989194de5674f221de5
Showing with 10 additions and 10 deletions.
  1. +1 −1 src/ex_getln.c
  2. +2 −2 src/gui.c
  3. +3 −3 src/screen.c
  4. +2 −2 src/structs.h
  5. +2 −0 src/version.c
  6. +0 −2 src/vim.h
View
@@ -3438,7 +3438,7 @@ compute_cmdrow(void)
cmdline_row = Rows - 1;
else
cmdline_row = W_WINROW(lastwin) + lastwin->w_height
+ W_STATUS_HEIGHT(lastwin);
+ lastwin->w_status_height;
}
static void
View
@@ -4910,10 +4910,10 @@ xy2win(int x UNUSED, int y UNUSED)
}
else if (row > wp->w_height) /* below status line */
update_mouseshape(SHAPE_IDX_CLINE);
else if (!(State & CMDLINE) && W_VSEP_WIDTH(wp) > 0 && col == wp->w_width
else if (!(State & CMDLINE) && wp->w_vsep_width > 0 && col == wp->w_width
&& (row != wp->w_height || !stl_connected(wp)) && msg_scrolled == 0)
update_mouseshape(SHAPE_IDX_VSEP);
else if (!(State & CMDLINE) && W_STATUS_HEIGHT(wp) > 0
else if (!(State & CMDLINE) && wp->w_status_height > 0
&& row == wp->w_height && msg_scrolled == 0)
update_mouseshape(SHAPE_IDX_STATUS);
else
View
@@ -622,8 +622,8 @@ update_screen(int type_arg)
else
{
wp->w_redr_type = NOT_VALID;
if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp)
<= msg_scrolled)
if (W_WINROW(wp) + wp->w_height + wp->w_status_height
<= msg_scrolled)
wp->w_redr_status = TRUE;
}
}
@@ -9490,7 +9490,7 @@ win_ins_lines(
{
wp->w_redr_status = TRUE;
redraw_cmdline = TRUE;
nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp);
nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height;
lastrow = nextrow + line_count;
if (lastrow > Rows)
lastrow = Rows;
View
@@ -2702,8 +2702,8 @@ struct window_S
int w_status_height; /* number of status lines (0 or 1) */
int w_wincol; /* Leftmost column of window in screen. */
int w_width; /* Width of window, excluding separation. */
int w_vsep_width; /* Number of separator columns (0 or 1).
use W_VSEP_WIDTH() */
int w_vsep_width; /* Number of separator columns (0 or 1). */
/*
* === start of cached values ====
*/
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1143,
/**/
1142,
/**/
View
@@ -860,8 +860,6 @@ extern int (*dyn_libintl_putenv)(const char *envstring);
#define FINDFILE_BOTH 2 /* files and directories */
#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)
#ifdef FEAT_MENU
# define W_WINROW(wp) (wp->w_winrow + wp->w_winbar_height)
#else

0 comments on commit e0de17d

Please sign in to comment.