summaryrefslogtreecommitdiff
path: root/src/ui.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-22 15:20:32 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-22 15:20:32 +0200
commit0263146b5dbbb6c120ce2e7720256503b864425d (patch)
treeb6f18fde8fd4bbc29c322b414ac584106e512d7a /src/ui.c
parent53f8174eaeb93b381cf74c58863f8fe82748a22a (diff)
downloadvim-git-0263146b5dbbb6c120ce2e7720256503b864425d.tar.gz
patch 8.0.1136: W_WIDTH() is always the samev8.0.1136
Problem: W_WIDTH() is always the same. Solution: Expand the macro.
Diffstat (limited to 'src/ui.c')
-rw-r--r--src/ui.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui.c b/src/ui.c
index 64553b1fe..867b8a501 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -2739,7 +2739,7 @@ retnomove:
#ifdef FEAT_FOLDING
&& (
# ifdef FEAT_RIGHTLEFT
- wp->w_p_rl ? col < W_WIDTH(wp) - wp->w_p_fdc :
+ wp->w_p_rl ? col < wp->w_width - wp->w_p_fdc :
# endif
col >= wp->w_p_fdc
# ifdef FEAT_CMDWIN
@@ -2945,7 +2945,7 @@ retnomove:
/* Check for position outside of the fold column. */
if (
# ifdef FEAT_RIGHTLEFT
- curwin->w_p_rl ? col < W_WIDTH(curwin) - curwin->w_p_fdc :
+ curwin->w_p_rl ? col < curwin->w_width - curwin->w_p_fdc :
# endif
col >= curwin->w_p_fdc
# ifdef FEAT_CMDWIN
@@ -3020,7 +3020,7 @@ mouse_comp_pos(
#ifdef FEAT_RIGHTLEFT
if (win->w_p_rl)
- col = W_WIDTH(win) - 1 - col;
+ col = win->w_width - 1 - col;
#endif
lnum = win->w_topline;
@@ -3064,7 +3064,7 @@ mouse_comp_pos(
off = win_col_off(win) - win_col_off2(win);
if (col < off)
col = off;
- col += row * (W_WIDTH(win) - off);
+ col += row * (win->w_width - off);
/* add skip column (for long wrapping line) */
col += win->w_skipcol;
}