summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Src/Zle/compresult.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 970eba1c4..413752da6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-06  Peter Stephenson  <pws@csr.com>
+
+	* Greg Klanderman <gak@klanderman.net>: 18191:
+	Src/Zle/compresult.c: `compctl -y' didn't obey the listpacked
+	and listrowsfirst options.
+
 2003-02-05  Peter Stephenson  <pws@csr.com>
 
 	* 18195: Doc/Zsh/builtins.yo Src/builtin.c Src/utils.c
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index 218afc319..bc6cc36b2 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -1408,6 +1408,13 @@ calclist(int showall)
 	g->flags |= CGF_PACKED | CGF_ROWS;
 
 	if (!onlyexpl && pp) {
+            if (*pp) {
+                if (!isset(LISTPACKED))
+                    g->flags &= ~CGF_PACKED;
+                if (!isset(LISTROWSFIRST))
+                    g->flags &= ~CGF_ROWS;
+            }
+
 	    /* We have an ylist, lets see, if it contains newlines. */
 	    hidden = 1;
 	    while (!nl && *pp) {