diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-02-20 13:59:32 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-02-20 13:59:32 +0000 |
| commit | 9c33a7c971279b77fe4fc74076f5735b88ead71b (patch) | |
| tree | babd6102bbfeb6d2ab1689a2e2c7d3e09595d920 /src | |
| parent | 561f9db88cf4e69f27fcca1b02e78e7b72294acc (diff) | |
updated for version 7.1-260v7.1.260
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/charset.c b/src/charset.c index 32d7555325..a79f0fd02b 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 459c90e5fc..26bfaa2d7b 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, |