about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2005-09-22 01:36:35 +0000
committerClint Adams <clint@users.sourceforge.net>2005-09-22 01:36:35 +0000
commitfdd0397411d647405f92aaebaae0e9d310436e96 (patch)
tree869867e744862c688c0c1991c65b04b0c913660f
parent4882c536e98f68b2ecaecb4ed06f95fde9ed8a75 (diff)
downloadzsh-fdd0397411d647405f92aaebaae0e9d310436e96.tar.gz
zsh-fdd0397411d647405f92aaebaae0e9d310436e96.tar.xz
zsh-fdd0397411d647405f92aaebaae0e9d310436e96.zip
Stephen Rueger: 21744: unconditionally assume that \t or \n are not part of multi-byte characters.
-rw-r--r--ChangeLog5
-rw-r--r--Src/prompt.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 45412af1a..04ce046bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-22  Clint Adams  <clint@zsh.org>
+
+	* Stephen Rueger: 21744: unconditionally assume that
+	\t or \n are not part of multi-byte characters.
+
 2005-09-20  Clint Adams  <clint@zsh.org>
 
 	* 21740: Completion/Unix/Command/_quilt: completion for
diff --git a/Src/prompt.c b/Src/prompt.c
index 27a07c574..8bd1ad9de 100644
--- a/Src/prompt.c
+++ b/Src/prompt.c
@@ -859,7 +859,7 @@ countprompt(char *str, int *wp, int *hp, int overf)
 		 * relying on the character set being an extension
 		 * of ASCII so it's safe to test a single byte.
 		 */
-		if (multi) {
+		if (!multi) {
 #endif
 		    if (*str == '\t') {
 			w = (w | 7) + 1;