From 7f21665673686c653389ff4e86a2ce8e17804178 Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Wed, 28 May 2014 16:35:14 -0500 Subject: move/remove W_* macros move W_ENDCOL to screen.c remove the rest of the W_* macros --- src/nvim/window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index 7134c5f6f3..16127186ff 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2096,7 +2096,7 @@ winframe_remove ( * updated. Can only be done after the sizes have been updated. */ if (frp2 == frp_close->fr_next) { int row = win->w_winrow; - int col = W_WINCOL(win); + int col = win->w_wincol; frame_comp_pos(frp2, &row, &col); } @@ -4525,11 +4525,11 @@ void win_new_height(win_T *wp, int height) */ wp->w_wrow = line_size; if (wp->w_wrow >= wp->w_height - && (W_WIDTH(wp) - win_col_off(wp)) > 0) { - wp->w_skipcol += W_WIDTH(wp) - win_col_off(wp); + && (wp->w_width - win_col_off(wp)) > 0) { + wp->w_skipcol += wp->w_width - win_col_off(wp); --wp->w_wrow; while (wp->w_wrow >= wp->w_height) { - wp->w_skipcol += W_WIDTH(wp) - win_col_off(wp) + wp->w_skipcol += wp->w_width - win_col_off(wp) + win_col_off2(wp); --wp->w_wrow; } -- cgit