commit 0263146b5dbbb6c120ce2e7720256503b864425d
author Bram Moolenaar <Bram@vim.org> Fri Sep 22 15:20:32 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Sep 22 15:20:32 2017 +0200
tree b6f18fde8fd4bbc29c322b414ac584106e512d7a
parent 53f8174eaeb93b381cf74c58863f8fe82748a22a

patch 8.0.1136: W_WIDTH() is always the same

Problem:    W_WIDTH() is always the same.
Solution:   Expand the macro.

src/getchar.c

diff --git a/src/getchar.c b/src/getchar.c
index 179b2f3..ef42d9c 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2666,8 +2666,8 @@
 					++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();
 #ifdef FEAT_MBYTE
 				col = 0;	/* no correction needed */
@@ -2684,7 +2684,7 @@
 			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;
 #ifdef FEAT_MBYTE
 			    col = curwin->w_cursor.col - 1;
 #endif