From 40446a9827310f732ed591e8408a8d0443fa0773 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Mon, 8 Jun 2015 09:50:26 +0100
Subject: 35416: Turn on MULTIBYTE in all emulations.

This now includes sh.
---
 ChangeLog     | 5 +++++
 Src/options.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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
-- 
cgit 1.4.1