about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-08-02 09:02:30 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-08-02 09:02:30 +0000
commitedcd71603de1a202984d2730deffacab9d5475d8 (patch)
treecf1fa8b58ff19ce9ac88e45bf8ce74fa5726b43b
parentfc7ad5cc1caca79c160530d69521319a2136f8ef (diff)
downloadzsh-edcd71603de1a202984d2730deffacab9d5475d8.tar.gz
zsh-edcd71603de1a202984d2730deffacab9d5475d8.tar.xz
zsh-edcd71603de1a202984d2730deffacab9d5475d8.zip
Daiki Ueno: 28112: fix character width assignment
-rw-r--r--ChangeLog7
-rw-r--r--Src/Zle/zle_refresh.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e688ce31a..8a058415c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-02  Peter Stephenson  <pws@csr.com>
+
+	* Daiki Ueno: 28112: Src/Zle/zle_refresh.c: missing parentheses
+	caused incorrect size for character width.
+
 2010-07-31  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* users/15219: Src/jobs.c: print exit status if PRINTEXITVALUE
@@ -13463,5 +13468,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5043 $
+* $Revision: 1.5044 $
 *****************************************************
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index 352dcf0d6..f03e7dc63 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -2341,7 +2341,7 @@ singlerefresh(ZLE_STRING_T tmpline, int tmpll, int tmpcs)
 	if (tmpline[t0] == ZWC('\t'))
 	    vsiz = (vsiz | 7) + 2;
 #ifdef MULTIBYTE_SUPPORT
-	else if (iswprint(tmpline[t0]) && (width = WCWIDTH(tmpline[t0]) > 0)) {
+	else if (iswprint(tmpline[t0]) && ((width = WCWIDTH(tmpline[t0])) > 0)) {
 	    vsiz += width;
 	    if (isset(COMBININGCHARS) && IS_BASECHAR(tmpline[t0])) {
 		while (t0 < tmpll-1 && IS_COMBINING(tmpline[t0+1]))