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/getchar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nvim/getchar.c') diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index c3ef6f0610..6b41dde827 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2168,8 +2168,8 @@ static int vgetorpeek(int advance) ++col; } curwin->w_wrow = curwin->w_cline_row - + curwin->w_wcol / W_WIDTH(curwin); - curwin->w_wcol %= W_WIDTH(curwin); + + curwin->w_wcol / curwin->w_width; + curwin->w_wcol %= curwin->w_width; curwin->w_wcol += curwin_col_off(); col = 0; /* no correction needed */ } else { @@ -2178,7 +2178,7 @@ static int vgetorpeek(int advance) } } else if (curwin->w_p_wrap && curwin->w_wrow) { --curwin->w_wrow; - curwin->w_wcol = W_WIDTH(curwin) - 1; + curwin->w_wcol = curwin->w_width - 1; col = curwin->w_cursor.col - 1; } if (has_mbyte && col > 0 && curwin->w_wcol > 0) { -- cgit