move/remove W_* macros

move W_ENDCOL to screen.c
remove the rest of the W_* macros
This commit is contained in:
Brandon Coleman
2014-05-28 16:35:14 -05:00
parent 7cdbca7789
commit 7f21665673
21 changed files with 176 additions and 183 deletions

View File

@@ -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) {