From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 20 Feb 2008 13:59:32 +0000 (+0000)
Subject: updated for version 7.1-260
X-Git-Tag: v7.1.260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c33a7c971279b77fe4fc74076f5735b88ead71b;p=vim

updated for version 7.1-260
---

diff --git a/src/charset.c b/src/charset.c
index 32d755532..a79f0fd02 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1290,7 +1290,8 @@ getvcol(wp, pos, start, cursor, end)
 		    /* If a double-cell char doesn't fit at the end of a line
 		     * it wraps to the next line, it's like this char is three
 		     * cells wide. */
-		    if (incr == 2 && wp->w_p_wrap && in_win_border(wp, vcol))
+		    if (incr == 2 && wp->w_p_wrap && MB_BYTE2LEN(*ptr) > 1
+			    && in_win_border(wp, vcol))
 		    {
 			++incr;
 			head = 1;
diff --git a/src/version.c b/src/version.c
index 459c90e5f..26bfaa2d7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    260,
 /**/
     259,
 /**/