summary refs log tree commit diff
path: root/Src/zsh.h
diff options
context:
space:
mode:
authorJoshua Rubin <joshua@rubixconsulting.com>2016-11-29 00:42:28 -0700
committerPeter Stephenson <pws@zsh.org>2016-11-29 17:19:53 +0000
commit596ba302e6f23089e58ff05d75fedfca8e79a7d2 (patch)
treebcb6eed9607546237569565b46e68fc4bff01cce /Src/zsh.h
parent110ffae9fefa1367af4fdcc90a456de23b92436c (diff)
downloadzsh-596ba302e6f23089e58ff05d75fedfca8e79a7d2.tar.gz
zsh-596ba302e6f23089e58ff05d75fedfca8e79a7d2.tar.xz
zsh-596ba302e6f23089e58ff05d75fedfca8e79a7d2.zip
40037: Unicode 9 character width support.
Enable with --enable-unicode9.
Diffstat (limited to 'Src/zsh.h')
-rw-r--r--Src/zsh.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Src/zsh.h b/Src/zsh.h
index 63cada827..dae2b2459 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -3131,7 +3131,9 @@ typedef wint_t convchar_t;
  * much what the definition tells us.  However, we happen to know this
  * works on MacOS which doesn't define that.
  */
-#if defined(BROKEN_WCWIDTH) && (defined(__STDC_ISO_10646__) || defined(__APPLE__))
+#ifdef ENABLE_UNICODE9
+#define WCWIDTH(wc)	mk_wcwidth(wc)
+#elif defined(BROKEN_WCWIDTH) && (defined(__STDC_ISO_10646__) || defined(__APPLE__))
 #define WCWIDTH(wc)	mk_wcwidth(wc)
 #else
 #define WCWIDTH(wc)	wcwidth(wc)