summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/options.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8dfdbc5cd..1ec1b05ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-08 Peter Stephenson <p.stephenson@samsung.com>
+
+ * 35416: Src/options.c: Turn on MULTIBYTE in all
+ emulations, including sh.
+
2015-06-08 Daniel Hahler <zsh@thequod.de>
* 35216: Completion/Unix/Command/_git: _git-checkout: do not call
diff --git a/Src/options.c b/Src/options.c
index 3e3e07474..78f603de1 100644
--- a/Src/options.c
+++ b/Src/options.c
@@ -192,7 +192,7 @@ static struct optname optns[] = {
{{NULL, "monitor", OPT_SPECIAL}, MONITOR},
{{NULL, "multibyte",
#ifdef MULTIBYTE_SUPPORT
- OPT_EMULATE|OPT_ZSH|OPT_CSH|OPT_KSH
+ OPT_ALL
#else
0
#endif