about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2006-08-14 13:29:29 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2006-08-14 13:29:29 +0000
commitf2dbedcc4f878e4eb35f72899feec7593d920c5a (patch)
tree91f64b0076aaebf93ad886a6ecec78614c9de4b1
parent227448bbe963825705b1a6d021020fb2a7bb5fac (diff)
downloadzsh-f2dbedcc4f878e4eb35f72899feec7593d920c5a.tar.gz
zsh-f2dbedcc4f878e4eb35f72899feec7593d920c5a.tar.xz
zsh-f2dbedcc4f878e4eb35f72899feec7593d920c5a.zip
22605: bug in complist wide character fixes introduced infinite loop
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/complist.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f838b6bff..eb1bb8c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-14  Peter Stephenson  <pws@csr.com>
+
+	* 22605: Src/Zle/complist.c: bug in 22597 noticed by Bart
+	when not printing.
+
 2006-08-13  Clint Adams  <clint@zsh.org>
 
 	* unposted: Functions/Zle/.distfiles,
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index d982b22ce..651a22b68 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1069,6 +1069,8 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
 		    return mlprinted;
 		}
 	    }
+	    else
+		p += len;
 	}
     }
     if (dopr) {