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_utils.c | |
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_utils.c')
-rw-r--r-- | Src/Zle/zle_utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c index a65aa05d0..063427659 100644 --- a/Src/Zle/zle_utils.c +++ b/Src/Zle/zle_utils.c @@ -132,7 +132,7 @@ zlelineasstring(ZLE_STRING_T instr, int inll, int incs, int *outllp, { int outcs, outll; -#ifdef ZLE_UNICODE_SUPPORT +#ifdef MULTIBYTE_SUPPORT char *s; int i, j; size_t mb_len = 0; @@ -167,7 +167,7 @@ zlelineasstring(ZLE_STRING_T instr, int inll, int incs, int *outllp, * metafiable characters. */ if (outcsp != NULL || outllp != NULL) { -#ifdef ZLE_UNICODE_SUPPORT +#ifdef MULTIBYTE_SUPPORT unsigned char *strp = (unsigned char *)s; #else unsigned char *strp = instr; @@ -189,7 +189,7 @@ zlelineasstring(ZLE_STRING_T instr, int inll, int incs, int *outllp, *outllp = outll; } -#ifdef ZLE_UNICODE_SUPPORT +#ifdef MULTIBYTE_SUPPORT if (useheap) { unsigned char *ret = @@ -242,7 +242,7 @@ stringaszleline(unsigned char *instr, int incs, { ZLE_STRING_T outstr; int ll, sz; -#ifdef ZLE_UNICODE_SUPPORT +#ifdef MULTIBYTE_SUPPORT mbstate_t ps; #endif @@ -274,7 +274,7 @@ stringaszleline(unsigned char *instr, int incs, *outsz = ll; outstr = (ZLE_STRING_T)zalloc(sz); -#ifdef ZLE_UNICODE_SUPPORT +#ifdef MULTIBYTE_SUPPORT if (ll) { char *inptr = (char *)instr; wchar_t *outptr = outstr; @@ -785,7 +785,7 @@ showmsg(char const *msg) char const *p; int up = 0, cc = 0; ZLE_CHAR_T c; -#ifdef ZLE_UNICODE_SUPPORT +#ifdef MULTIBYTE_SUPPORT char *umsg; int ulen, ret; size_t width; @@ -795,7 +795,7 @@ showmsg(char const *msg) trashzle(); clearflag = isset(USEZLE) && !termflags && isset(ALWAYSLASTPROMPT); -#ifdef ZLE_UNICODE_SUPPORT +#ifdef MULTIBYTE_SUPPORT umsg = ztrdup(msg); p = unmetafy(umsg, &ulen); memset(&ps, 0, sizeof(ps)); |