From 370e7f73f68af06aaf1595bc8b16ec7e8c910409 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 11 Jun 2015 12:41:05 +0100 Subject: 35442: document MULTIBYTE is always on by default when available --- ChangeLog | 5 +++++ Doc/Zsh/options.yo | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8228ff4aa..4f96800b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-06-11 Peter Stephenson + + * 35442: Doc/Zsh/options.yo: multibyte option now on + everywhere by default. + 2015-06-08 Oliver Kiddle * 35418: Doc/Zsh/compsys.yo: fix usage synopsis for _describe diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index fa5402426..db9b18b8c 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -634,7 +634,7 @@ pindex(NO_MULTIBYTE) pindex(NOMULTIBYTE) cindex(characters, multibyte, in expansion and globbing) cindex(multibyte characters, in expansion and globbing) -item(tt(MULTIBYTE) )( +item(tt(MULTIBYTE) )( 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 @@ -642,10 +642,8 @@ 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) 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 interactive use may need to be -turned on if the terminal interprets multibyte characters. +tt(MULTIBYTE_SUPPORT); otherwise it is off by default and has no effect +if turned on. If the option is off a single byte is always treated as a single character. This setting is designed purely for examining strings -- cgit 1.4.1