diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-03-07 09:44:28 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-03-07 09:44:28 +0000 |
| commit | d70cfd3310eab37534a601d954ff41fcf7cdf772 (patch) | |
| tree | 17797fbe688a3d871988fdddee92308c794b325c | |
| parent | 697d170928a0b0abec0b7a9650bf9a2068b9060f (diff) | |
| download | zsh-d70cfd3310eab37534a601d954ff41fcf7cdf772.tar.gz zsh-d70cfd3310eab37534a601d954ff41fcf7cdf772.tar.xz zsh-d70cfd3310eab37534a601d954ff41fcf7cdf772.zip | |
24696: turn off MULTIBYTE by default in sh emulation
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Zsh/options.yo | 10 | ||||
| -rw-r--r-- | Src/options.c | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 8d9b4f681..bdc93e756 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-07 Peter Stephenson <pws@csr.com> + + * 24696: Doc/Zsh/options.yo, Src/options.c: turn off MULTIBYTE + by default in sh emulation. + 2008-03-06 Wayne Davison <wayned@users.sourceforge.net> * 24693: Src/utils.c: provide better errors when skipping diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index 32ec48de3..b0b575a23 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -427,10 +427,10 @@ item(tt(MARK_DIRS) (tt(-8), ksh: tt(-X)))( Append a trailing `tt(/)' to all directory names resulting from filename generation (globbing). ) -pindex(MULTIBYTE <D>) +pindex(MULTIBYTE) cindex(characters, multibyte, in expansion and globbing) cindex(multibyte characters, in expansion and globbing) -item(tt(MULTIBYTE))( +item(tt(MULTIBYTE) <C> <K> <Z>)( Respect multibyte characters when found in strings. When this option is set, strings are examined using the system library to determine how many bytes form a character, depending @@ -438,8 +438,10 @@ on the current locale. This affects the way characters are counted in pattern matching, parameter values and various delimiters. The option is on by default if the shell was compiled with -tt(MULTIBYTE_SUPPORT); otherwise it is off by default and has no effect if -turned on. +tt(MULTIBYTE_SUPPORT) except in tt(sh) emulation; otherwise it is off by +default and has no effect if turned on. The mode is off in tt(sh) +emulation for compatibility but for interative use may need to be +turned on if the terminal interprets multibyte characters. If the option is off a single byte is always treated as a single character. This setting is designed purely for examining strings diff --git a/Src/options.c b/Src/options.c index 14b730ea5..753a9cb36 100644 --- a/Src/options.c +++ b/Src/options.c @@ -173,7 +173,7 @@ static struct optname optns[] = { {{NULL, "monitor", OPT_SPECIAL}, MONITOR}, {{NULL, "multibyte", #ifdef MULTIBYTE_SUPPORT - OPT_ALL + OPT_EMULATE|OPT_ZSH|OPT_CSH|OPT_KSH #else 0 #endif |