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/search.c

diff --git a/src/search.c b/src/search.c
index 39e353c..15d9b81 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2608,7 +2608,7 @@
 	if (!curwin->w_p_wrap)
 	    getvcol(curwin, lpos, NULL, &vcol, NULL);
 	if (curwin->w_p_wrap || (vcol >= curwin->w_leftcol
-			       && vcol < curwin->w_leftcol + W_WIDTH(curwin)))
+			       && vcol < curwin->w_leftcol + curwin->w_width))
 	{
 	    mpos = *lpos;    /* save the pos, update_screen() may change it */
 	    save_cursor = curwin->w_cursor;