diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-09-17 20:39:42 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-09-17 20:39:42 +0000 |
| commit | 1193636b4512d21b02b5f9cdb5ea68bad90349fc (patch) | |
| tree | 1680cb81e167d3d6861009547cd2bd74d677f57e | |
| parent | ad6c2274e8de90aee377e82771e7d04f50753271 (diff) | |
updated for version 7.1-116v7.1.116
| -rw-r--r-- | src/screen.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c index 770187bb90..ed3a1c1d52 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2305,9 +2305,11 @@ fold_line(wp, fold_count, foldinfo, lnum, row) prev_c = u8c; #endif /* Non-BMP character: display as ? or fullwidth ?. */ +#ifdef UNICODE16 if (u8c >= 0x10000) ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; else +#endif ScreenLinesUC[idx] = u8c; for (i = 0; i < Screen_mco; ++i) { @@ -3678,13 +3680,18 @@ win_line(wp, lnum, startrow, endrow, nochange) if ((mb_l == 1 && c >= 0x80) || (mb_l >= 1 && mb_c == 0) || (mb_l > 1 && (!vim_isprintc(mb_c) - || mb_c >= 0x10000))) +# ifdef UNICODE16 + || mb_c >= 0x10000 +# endif + ))) { /* * Illegal UTF-8 byte: display as <xx>. * Non-BMP character : display as ? or fullwidth ?. */ +# ifdef UNICODE16 if (mb_c < 0x10000) +# endif { transchar_hex(extra, mb_c); # ifdef FEAT_RIGHTLEFT @@ -3692,11 +3699,13 @@ win_line(wp, lnum, startrow, endrow, nochange) rl_mirror(extra); # endif } +# ifdef UNICODE16 else if (utf_char2cells(mb_c) != 2) STRCPY(extra, "?"); else /* 0xff1f in UTF-8: full-width '?' */ STRCPY(extra, "\357\274\237"); +# endif p_extra = extra; c = *p_extra; @@ -6245,6 +6254,7 @@ screen_puts_len(text, len, row, col, attr) else u8c = utfc_ptr2char(ptr, u8cc); mbyte_cells = utf_char2cells(u8c); +# ifdef UNICODE16 /* Non-BMP character: display as ? or fullwidth ?. */ if (u8c >= 0x10000) { @@ -6252,6 +6262,7 @@ screen_puts_len(text, len, row, col, attr) if (attr == 0) attr = hl_attr(HLF_8); } +# endif # ifdef FEAT_ARABIC if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) { diff --git a/src/version.c b/src/version.c index c8ee70a873..c470e4d736 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 */ /**/ + 116, +/**/ 115, /**/ 114, |