mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-20 06:56:05 +02:00
Code

YAMAMOTO Takashi: 30599: don't use replacement wcwidth if not ISO-10646

This commit is contained in:
Peter Stephenson 2012-08-07 18:29:02 +00:00
parent 494444b90a
commit 85a698b8ec
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
2012-08-07 Peter Stephenson <p.w.stephenson@ntlworld.com>
* YAMAMOTO Takashi: 30599: Src/compat.c, Src/zsh.h: don't
use the replacement wcwidth if not ISO-10646 as the assumptions
it makes probably won't work.
2012-07-27 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 30590: Doc/Makefile.in, Doc/.distfiles: work around problem
@ -16467,5 +16473,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5684 $
* $Revision: 1.5685 $
*****************************************************

4
Src/compat.c
View File

@ -630,7 +630,7 @@ strtoul(nptr, endptr, base)
#endif /* HAVE_STRTOUL */
/**/
#ifdef BROKEN_WCWIDTH
#if defined(BROKEN_WCWIDTH) && defined(__STDC_ISO_10646__)
/*
* This is an implementation of wcwidth() and wcswidth() (defined in
@ -949,5 +949,5 @@ int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n)
#endif /* 0 */
/**/
#endif /* BROKEN_WCWIDTH */
#endif /* BROKEN_WCWIDTH && __STDC_ISO_10646__ */

2
Src/zsh.h
View File

@ -2678,7 +2678,7 @@ typedef wint_t convchar_t;
#define MB_METASTRWIDTH(str) mb_metastrlen(str, 1)
#define MB_METASTRLEN2(str, widthp) mb_metastrlen(str, widthp)
#ifdef BROKEN_WCWIDTH
#if defined(BROKEN_WCWIDTH) && defined(__STDC_ISO_10646__)
#define WCWIDTH(wc) mk_wcwidth(wc)
#else
#define WCWIDTH(wc) wcwidth(wc)