|
 |
688fa6d |
To: vim-dev@vim.org
|
|
|
688fa6d |
Subject: patch 7.1.116
|
|
|
688fa6d |
Fcc: outbox
|
|
|
688fa6d |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
688fa6d |
Mime-Version: 1.0
|
|
|
688fa6d |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
688fa6d |
Content-Transfer-Encoding: 8bit
|
|
|
688fa6d |
------------
|
|
|
688fa6d |
|
|
|
688fa6d |
Patch 7.1.116
|
|
|
688fa6d |
Problem: Cannot display Unicode characters above 0x10000.
|
|
|
688fa6d |
Solution: Remove the replacement with a question mark when UNICODE16 is not
|
|
|
688fa6d |
defined. (partly by Nicolas Weber)
|
|
|
688fa6d |
Files: src/screen.c
|
|
|
688fa6d |
|
|
|
688fa6d |
|
|
|
688fa6d |
*** ../vim-7.1.115/src/screen.c Thu Aug 30 13:51:52 2007
|
|
|
688fa6d |
--- src/screen.c Mon Sep 10 22:29:42 2007
|
|
|
688fa6d |
***************
|
|
|
688fa6d |
*** 2305,2313 ****
|
|
|
688fa6d |
--- 2305,2315 ----
|
|
|
688fa6d |
prev_c = u8c;
|
|
|
688fa6d |
#endif
|
|
|
688fa6d |
/* Non-BMP character: display as ? or fullwidth ?. */
|
|
|
688fa6d |
+ #ifdef UNICODE16
|
|
|
688fa6d |
if (u8c >= 0x10000)
|
|
|
688fa6d |
ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?';
|
|
|
688fa6d |
else
|
|
|
688fa6d |
+ #endif
|
|
|
688fa6d |
ScreenLinesUC[idx] = u8c;
|
|
|
688fa6d |
for (i = 0; i < Screen_mco; ++i)
|
|
|
688fa6d |
{
|
|
|
688fa6d |
***************
|
|
|
688fa6d |
*** 3678,3690 ****
|
|
|
688fa6d |
if ((mb_l == 1 && c >= 0x80)
|
|
|
688fa6d |
|| (mb_l >= 1 && mb_c == 0)
|
|
|
688fa6d |
|| (mb_l > 1 && (!vim_isprintc(mb_c)
|
|
|
688fa6d |
! || mb_c >= 0x10000)))
|
|
|
688fa6d |
{
|
|
|
688fa6d |
/*
|
|
|
688fa6d |
* Illegal UTF-8 byte: display as <xx>.
|
|
|
688fa6d |
* Non-BMP character : display as ? or fullwidth ?.
|
|
|
688fa6d |
*/
|
|
|
688fa6d |
if (mb_c < 0x10000)
|
|
|
688fa6d |
{
|
|
|
688fa6d |
transchar_hex(extra, mb_c);
|
|
|
688fa6d |
# ifdef FEAT_RIGHTLEFT
|
|
|
688fa6d |
--- 3680,3697 ----
|
|
|
688fa6d |
if ((mb_l == 1 && c >= 0x80)
|
|
|
688fa6d |
|| (mb_l >= 1 && mb_c == 0)
|
|
|
688fa6d |
|| (mb_l > 1 && (!vim_isprintc(mb_c)
|
|
|
688fa6d |
! # ifdef UNICODE16
|
|
|
688fa6d |
! || mb_c >= 0x10000
|
|
|
688fa6d |
! # endif
|
|
|
688fa6d |
! )))
|
|
|
688fa6d |
{
|
|
|
688fa6d |
/*
|
|
|
688fa6d |
* Illegal UTF-8 byte: display as <xx>.
|
|
|
688fa6d |
* Non-BMP character : display as ? or fullwidth ?.
|
|
|
688fa6d |
*/
|
|
|
688fa6d |
+ # ifdef UNICODE16
|
|
|
688fa6d |
if (mb_c < 0x10000)
|
|
|
688fa6d |
+ # endif
|
|
|
688fa6d |
{
|
|
|
688fa6d |
transchar_hex(extra, mb_c);
|
|
|
688fa6d |
# ifdef FEAT_RIGHTLEFT
|
|
|
688fa6d |
***************
|
|
|
688fa6d |
*** 3692,3702 ****
|
|
|
688fa6d |
--- 3699,3711 ----
|
|
|
688fa6d |
rl_mirror(extra);
|
|
|
688fa6d |
# endif
|
|
|
688fa6d |
}
|
|
|
688fa6d |
+ # ifdef UNICODE16
|
|
|
688fa6d |
else if (utf_char2cells(mb_c) != 2)
|
|
|
688fa6d |
STRCPY(extra, "?");
|
|
|
688fa6d |
else
|
|
|
688fa6d |
/* 0xff1f in UTF-8: full-width '?' */
|
|
|
688fa6d |
STRCPY(extra, "\357\274\237");
|
|
|
688fa6d |
+ # endif
|
|
|
688fa6d |
|
|
|
688fa6d |
p_extra = extra;
|
|
|
688fa6d |
c = *p_extra;
|
|
|
688fa6d |
***************
|
|
|
688fa6d |
*** 6245,6250 ****
|
|
|
688fa6d |
--- 6254,6260 ----
|
|
|
688fa6d |
else
|
|
|
688fa6d |
u8c = utfc_ptr2char(ptr, u8cc);
|
|
|
688fa6d |
mbyte_cells = utf_char2cells(u8c);
|
|
|
688fa6d |
+ # ifdef UNICODE16
|
|
|
688fa6d |
/* Non-BMP character: display as ? or fullwidth ?. */
|
|
|
688fa6d |
if (u8c >= 0x10000)
|
|
|
688fa6d |
{
|
|
|
688fa6d |
***************
|
|
|
688fa6d |
*** 6252,6257 ****
|
|
|
688fa6d |
--- 6262,6268 ----
|
|
|
688fa6d |
if (attr == 0)
|
|
|
688fa6d |
attr = hl_attr(HLF_8);
|
|
|
688fa6d |
}
|
|
|
688fa6d |
+ # endif
|
|
|
688fa6d |
# ifdef FEAT_ARABIC
|
|
|
688fa6d |
if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c))
|
|
|
688fa6d |
{
|
|
|
688fa6d |
*** ../vim-7.1.116/src/version.c Mon Sep 17 22:19:43 2007
|
|
|
688fa6d |
--- src/version.c Mon Sep 17 22:37:31 2007
|
|
|
688fa6d |
***************
|
|
|
688fa6d |
*** 668,669 ****
|
|
|
688fa6d |
--- 668,671 ----
|
|
|
688fa6d |
{ /* Add new patch number below this line */
|
|
|
688fa6d |
+ /**/
|
|
|
688fa6d |
+ 116,
|
|
|
688fa6d |
/**/
|
|
|
688fa6d |
|
|
|
688fa6d |
--
|
|
|
688fa6d |
There can't be a crisis today, my schedule is already full.
|
|
|
688fa6d |
|
|
|
688fa6d |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
688fa6d |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
688fa6d |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
688fa6d |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|