Mercurial > vim
changeset 2069:63613d8d7e4d v7.2.354
updated for version 7.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)
author | Bram Moolenaar <bram@zimbu.org> |
---|---|
date | Wed, 03 Feb 2010 15:48:04 +0100 |
parents | 98a2a6e6b966 |
children | 4483ee552619 |
files | src/screen.c src/version.c |
diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -2335,13 +2335,12 @@ fold_line(wp, fold_count, foldinfo, lnum 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, noc 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)