diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-07-25 18:10:37 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-07-25 18:10:37 +0000 |
| commit | 09bc7ee2b56239020d1ef6bb1f5d7b4ef9f19db1 (patch) | |
| tree | 9a1e2155b0feb322eb32c8ee14d252ffc0607388 /Src | |
| parent | b9bf52d1fc750633189c3d25182edc95ffdbcb19 (diff) | |
| download | zsh-09bc7ee2b56239020d1ef6bb1f5d7b4ef9f19db1.tar.gz zsh-09bc7ee2b56239020d1ef6bb1f5d7b4ef9f19db1.tar.xz zsh-09bc7ee2b56239020d1ef6bb1f5d7b4ef9f19db1.zip | |
22557: turn on multibyte option by default
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/options.c | 8 | ||||
| -rw-r--r-- | Src/pattern.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Src/options.c b/Src/options.c index 307bd5430..05e878687 100644 --- a/Src/options.c +++ b/Src/options.c @@ -166,7 +166,13 @@ static struct optname optns[] = { {{NULL, "markdirs", 0}, MARKDIRS}, {{NULL, "menucomplete", 0}, MENUCOMPLETE}, {{NULL, "monitor", OPT_SPECIAL}, MONITOR}, -{{NULL, "multibyte", 0/*TBD*/}, MULTIBYTE}, +{{NULL, "multibyte", +#ifdef MULTIBYTE_SUPPORT + OPT_ALL +#else + 0 +#endif + }, MULTIBYTE}, {{NULL, "multios", OPT_EMULATE|OPT_ZSH}, MULTIOS}, {{NULL, "nomatch", OPT_EMULATE|OPT_NONBOURNE},NOMATCH}, {{NULL, "notify", OPT_ZSH}, NOTIFY}, diff --git a/Src/pattern.c b/Src/pattern.c index 24077768d..9ae00ca94 100644 --- a/Src/pattern.c +++ b/Src/pattern.c @@ -343,7 +343,7 @@ metacharinc(char **x) /* Error. Treat as single byte. */ /* Reset the shift state for next time. */ memset(&shiftstate, 0, sizeof(shiftstate)); - return (wchar_t) *(*x)++; + return (wchar_t) STOUC(*(*x)++); } #else @@ -595,7 +595,7 @@ patcompile(char *exp, int inflags, char **endexp) while (oplen--) { if (imeta(*opnd)) { *dst++ = Meta; - *dst++ = *opnd ^ 32; + *dst++ = *opnd++ ^ 32; } else { *dst++ = *opnd++; } |