updated for version 7.1-260
diff --git a/src/charset.c b/src/charset.c
index 32d7555..a79f0fd 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1290,7 +1290,8 @@
/* 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 459c90e..26bfaa2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 260,
+/**/
259,
/**/
258,
