From 809ab19dff75185a805b4cbb31a6b89f225167f4 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 6 Feb 2003 10:29:30 +0000 Subject: 18191: from Greg Klanderman: compctl -y didn't respect list arrangement options listpacked and listrowsfirst. --- ChangeLog | 6 ++++++ Src/Zle/compresult.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 970eba1c4..413752da6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-02-06 Peter Stephenson + + * Greg Klanderman : 18191: + Src/Zle/compresult.c: `compctl -y' didn't obey the listpacked + and listrowsfirst options. + 2003-02-05 Peter Stephenson * 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) { -- cgit 1.4.1