From 67847a96ee2bff708b2f7b6ec25cc850f818ea46 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Mon, 28 Mar 2011 04:50:20 +0000 Subject: 28926: No newline after the last line in listlist() when printing the list in a single column. --- ChangeLog | 7 ++++++- Src/Zle/zle_tricky.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa51a4af5..050d6af19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,11 @@ * Johan Sundström: 28890: Completion/Unix/Command/.distfiles, Completion/Unix/Command/_npm: New _npm completion. +2011-03-19 Barton E. Schaefer + + * 28926: Src/Zle/zle_tricky.c: No newline after the last line in + listlist() when printing the list in a single column. + 2011-03-18 Frank Terbeck * Nikolai Weibull: 28914: Completion/Unix/Command/_git: Typo @@ -14372,5 +14377,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5230 $ +* $Revision: 1.5231 $ ***************************************************** diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 74ebf0981..d3e30950d 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -2650,7 +2650,9 @@ listlist(LinkList l) } else { for (p = data; *p; p++) { nicezputs(*p, shout); - putc('\n', shout); + /* One column: newlines between elements, not after the last */ + if (p[1]) + putc('\n', shout); } } if (clearflag) { -- cgit 1.4.1