about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2001-10-05 12:44:00 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2001-10-05 12:44:00 +0000
commitaac666130c107cddbefe3531b8f7ab8370132dfe (patch)
tree5235ac9edf23ecc318a22db21ceb767cea81f83d
parent4bf4818f5a4ffc04f98c796c8b44dd7472fc771b (diff)
downloadzsh-aac666130c107cddbefe3531b8f7ab8370132dfe.tar.gz
zsh-aac666130c107cddbefe3531b8f7ab8370132dfe.tar.xz
zsh-aac666130c107cddbefe3531b8f7ab8370132dfe.zip
fix calculation of number of columns needed with list_packed (15946)
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/compresult.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ba7c2e18..0cf854663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-10-05  Sven Wischnowsky  <wischnow@zsh.org>
 
+	* 15946: Src/Zle/compresult.c: fix calculation of number of
+	columns needed with list_packed
+
 	* 15945: Completion/Zsh/Command/_cd: make _cd use only one call
 	to _alternative, including completions from _tilde (using the
 	named-directories tag)
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index a325b7be3..13b9edd72 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -1717,8 +1717,11 @@ calclist(int showall)
                                 ws[tcol] = len;
                             }
                         }
-                        if (width < columns)
+                        if (width < columns) {
+                            if (++tcol < tcols)
+                                tcols = tcol;
                             break;
+                        }
                     }
 		}
 	    }