summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2008-02-20 13:59:32 +0000
committervimboss <devnull@localhost>2008-02-20 13:59:32 +0000
commit27fff7a0a722a353671d89d5e74a1d02a481fca0 (patch)
treebabd6102bbfeb6d2ab1689a2e2c7d3e09595d920
parent0e4582d97897e9808e66f5831ec73a20e24c18d8 (diff)
downloadvim-27fff7a0a722a353671d89d5e74a1d02a481fca0.tar.gz
updated for version 7.1-260v7.1.260v7-1-260
-rw-r--r--src/charset.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/charset.c b/src/charset.c
index 32d75553..a79f0fd0 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 459c90e5..26bfaa2d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 260,
+/**/
259,
/**/
258,