diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2005-10-28 17:34:33 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2005-10-28 17:34:33 +0000 |
| commit | aea77152614952519351b5a52b6ec19ea7c302c2 (patch) | |
| tree | 12c6d5e230749099ad19a5f75bb9cfa7ce18ba70 /Src/Zle/zle.h | |
| parent | 5f11a38bea0b4d843c72dbdb9fab23280a0aa228 (diff) | |
| download | zsh-aea77152614952519351b5a52b6ec19ea7c302c2.tar.gz zsh-aea77152614952519351b5a52b6ec19ea7c302c2.tar.xz zsh-aea77152614952519351b5a52b6ec19ea7c302c2.zip | |
21943, 21945: ZLE_UNICODE_SUPPORT -> MULTIBYTE_SUPPORT;
use multibyte versions of nicechar wherever possible.
Diffstat (limited to 'Src/Zle/zle.h')
| -rw-r--r-- | Src/Zle/zle.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Src/Zle/zle.h b/Src/Zle/zle.h index 26a27fe09..9a3828139 100644 --- a/Src/Zle/zle.h +++ b/Src/Zle/zle.h @@ -27,7 +27,7 @@ * */ -#ifdef ZLE_UNICODE_SUPPORT +#ifdef MULTIBYTE_SUPPORT typedef wchar_t ZLE_CHAR_T; typedef wchar_t *ZLE_STRING_T; typedef wint_t ZLE_INT_T; @@ -67,9 +67,7 @@ typedef wint_t ZLE_INT_T; * Functions that operate on a metafied string. * These versions handle multibyte characters. */ -#define ZMB_nicewidth(s) mb_niceformat(s, NULL, NULL) -#define ZMB_niceputs(s, stream) (void)mb_niceformat(s, stream, NULL) -#define ZMB_niceztrdup(s) mb_niceztrdup(s) +#define ZMB_nicewidth(s) mb_niceformat(s, NULL, NULL, 0) /* Functions that operate on ZLE_CHAR_T. */ #define ZC_iblank iswspace @@ -84,7 +82,7 @@ typedef wint_t ZLE_INT_T; #define LASTFULLCHAR lastchar_wide -#else /* Not ZLE_UNICODE_SUPPORT: old single-byte code */ +#else /* Not MULTIBYTE_SUPPORT: old single-byte code */ typedef int ZLE_CHAR_T; typedef unsigned char *ZLE_STRING_T; @@ -111,8 +109,6 @@ typedef int ZLE_INT_T; * These versions don't handle multibyte characters. */ #define ZMB_nicewidth niceztrlen -#define ZMB_niceputs nicezputs -#define ZMB_niceztrdup(s) nicedup(s, 0) #define ZC_nicechar nicechar |