aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.0.1143: macros always expand to the same thing

Browse Source 
Problem:    Macros always expand to the same thing.
Solution:   Remove W_VSEP_WIDTH() and W_STATUS_HEIGHT().
This commit is contained in:
Bram Moolenaar
2017-09-24 16:24:34 +02:00
parent 378daf87d3
commit e0de17d84e
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_getln.c
View File

@@ -3438,7 +3438,7 @@ compute_cmdrow(void)
cmdline_row = Rows - 1; cmdline_row = Rows - 1;
else else
cmdline_row = W_WINROW(lastwin) + lastwin->w_height cmdline_row = W_WINROW(lastwin) + lastwin->w_height
+ W_STATUS_HEIGHT(lastwin); + lastwin->w_status_height;
} }
static void static void

4
src/gui.c
View File

@@ -4910,10 +4910,10 @@ xy2win(int x UNUSED, int y UNUSED)
} }
else if (row > wp->w_height) /* below status line */ else if (row > wp->w_height) /* below status line */
update_mouseshape(SHAPE_IDX_CLINE); 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) && (row != wp->w_height || !stl_connected(wp)) && msg_scrolled == 0)
update_mouseshape(SHAPE_IDX_VSEP); 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) && row == wp->w_height && msg_scrolled == 0)
update_mouseshape(SHAPE_IDX_STATUS); update_mouseshape(SHAPE_IDX_STATUS);
else else

6
src/screen.c
View File

@@ -622,8 +622,8 @@ update_screen(int type_arg)
else else
{ {
wp->w_redr_type = NOT_VALID; wp->w_redr_type = NOT_VALID;
if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) if (W_WINROW(wp) + wp->w_height + wp->w_status_height
<= msg_scrolled) <= msg_scrolled)
wp->w_redr_status = TRUE; wp->w_redr_status = TRUE;
} }
} }
@@ -9490,7 +9490,7 @@ win_ins_lines(
{ {
wp->w_redr_status = TRUE; wp->w_redr_status = TRUE;
redraw_cmdline = 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; lastrow = nextrow + line_count;
if (lastrow > Rows) if (lastrow > Rows)
lastrow = Rows; lastrow = Rows;

4
src/structs.h
View File

@@ -2702,8 +2702,8 @@ struct window_S
int w_status_height; /* number of status lines (0 or 1) */ int w_status_height; /* number of status lines (0 or 1) */
int w_wincol; /* Leftmost column of window in screen. */ int w_wincol; /* Leftmost column of window in screen. */
int w_width; /* Width of window, excluding separation. */ int w_width; /* Width of window, excluding separation. */
int w_vsep_width; /* Number of separator columns (0 or 1). int w_vsep_width; /* Number of separator columns (0 or 1). */
use W_VSEP_WIDTH() */
/* /*
* === start of cached values ==== * === start of cached values ====
*/ */

2
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1143,
/**/ /**/
1142, 1142,
/**/ /**/

2
src/vim.h
View File

@@ -860,8 +860,6 @@ extern int (*dyn_libintl_putenv)(const char *envstring);
#define FINDFILE_BOTH 2 /* files and directories */ #define FINDFILE_BOTH 2 /* files and directories */
#define W_ENDCOL(wp) (wp->w_wincol + wp->w_width) #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 #ifdef FEAT_MENU
# define W_WINROW(wp) (wp->w_winrow + wp->w_winbar_height) # define W_WINROW(wp) (wp->w_winrow + wp->w_winbar_height)
#else #else