diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-02-03 15:48:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-02-03 15:48:04 +0100 |
| commit | 990bb661a16eb654012eb855e4d17293bc272526 (patch) | |
| tree | 222e1ed596a6bfa6782d136f4400c79f1d82917b | |
| parent | f86f26c06a397b634a7c919a363c028c04f794f4 (diff) | |
| download | vim-git-990bb661a16eb654012eb855e4d17293bc272526.tar.gz | |
updated for version 7.2.354v7.2.354
Problem: Japanese single-width double-byte characters not handled correctly.
Solution: Put 0x8e in ScreenLines[] and the second byte in ScreenLines2[].
(partly by Kikuchan)
| -rw-r--r-- | src/screen.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/screen.c b/src/screen.c index d461cedee..7cd72bdce 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2335,13 +2335,12 @@ fold_line(wp, fold_count, foldinfo, lnum, row) if (cells > 1) ScreenLines[idx + 1] = 0; } - else if (cells > 1) /* double-byte character */ - { - if (enc_dbcs == DBCS_JPNU && *p == 0x8e) - ScreenLines2[idx] = p[1]; - else - ScreenLines[idx + 1] = p[1]; - } + else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) + /* double-byte single width character */ + ScreenLines2[idx] = p[1]; + else if (cells > 1) + /* double-width character */ + ScreenLines[idx + 1] = p[1]; col += cells; idx += cells; p += c_len; @@ -4631,7 +4630,11 @@ win_line(wp, lnum, startrow, endrow, nochange) ScreenLines[off] = c; #ifdef FEAT_MBYTE if (enc_dbcs == DBCS_JPNU) + { + if ((mb_c & 0xff00) == 0x8e00) + ScreenLines[off] = 0x8e; ScreenLines2[off] = mb_c & 0xff; + } else if (enc_utf8) { if (mb_utf8) diff --git a/src/version.c b/src/version.c index 6b1b88a32..bee0e2a15 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 354, +/**/ 353, /**/ 352, |