aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/cursor.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-06-12 20:13:52 -0400
committerJustin M. Keyes <justinkz@gmail.com>2014-06-12 20:13:52 -0400
commit168575f3f73f79185db0abdb91be364c0d0f29f9 (patch)
treec9bbf386710d6c57021e03811b2483bcd574812f /src/nvim/cursor.c
parent284a38a065f6cedd37f8f7d75c1953884653503c (diff)
parent1ff8ed7b823623e9abd224f78fbce7e20ce66f5d (diff)
downloadrneovim-168575f3f73f79185db0abdb91be364c0d0f29f9.tar.gz
rneovim-168575f3f73f79185db0abdb91be364c0d0f29f9.tar.bz2
rneovim-168575f3f73f79185db0abdb91be364c0d0f29f9.zip
Merge #774 'Move defines from vim.h to other header files'
Diffstat (limited to 'src/nvim/cursor.c')
-rw-r--r--src/nvim/cursor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c
index 5049a51872..18e95f0741 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -113,7 +113,7 @@ static int coladvance2(
--curwin->w_curswant;
}
} else {
- int width = W_WIDTH(curwin) - win_col_off(curwin);
+ int width = curwin->w_width - win_col_off(curwin);
if (finetune
&& curwin->w_p_wrap
@@ -217,7 +217,7 @@ static int coladvance2(
int b = (int)wcol - (int)col;
/* The difference between wcol and col is used to set coladd. */
- if (b > 0 && b < (MAXCOL - 2 * W_WIDTH(curwin)))
+ if (b > 0 && b < (MAXCOL - 2 * curwin->w_width))
pos->coladd = b;
col += b;
@@ -395,7 +395,7 @@ bool leftcol_changed(void)
bool retval = false;
changed_cline_bef_curs();
- lastcol = curwin->w_leftcol + W_WIDTH(curwin) - curwin_col_off() - 1;
+ lastcol = curwin->w_leftcol + curwin->w_width - curwin_col_off() - 1;
validate_virtcol();
/*