updated for version 7.1-260

diff --git a/src/charset.c b/src/charset.c
index 32d755532537282b4e8ae978792c664a6ceb070d..a79f0fd02bd65bd31ec46cd7932c328ebebfe6e5 100644 (file)
--- 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 459c90e5fc352ddb3d9cc7b776df0feab4ed619c..26bfaa2d7b58e6232a27dc4b6247a7257f31cabf 100644 (file)
--- 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,
 /**/