aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/window.c
diff options
context:
space:
mode:
authorBrandon Coleman <metrix1978@gmail.com>2014-05-28 16:35:14 -0500
committerBrandon Coleman <metrix1978@gmail.com>2014-06-12 01:20:36 -0500
commit7f21665673686c653389ff4e86a2ce8e17804178 (patch)
treebffd897b743ce4b1cf79ecbd4ca988821768c3a7 /src/nvim/window.c
parent7cdbca77899b8bb09c7a0a4c874c06021543c986 (diff)
downloadrneovim-7f21665673686c653389ff4e86a2ce8e17804178.tar.gz
rneovim-7f21665673686c653389ff4e86a2ce8e17804178.tar.bz2
rneovim-7f21665673686c653389ff4e86a2ce8e17804178.zip
move/remove W_* macros
move W_ENDCOL to screen.c remove the rest of the W_* macros
Diffstat (limited to 'src/nvim/window.c')
-rw-r--r--src/nvim/window.c8
1 files changed, 4 insertions, 4 deletions
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;
}