about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2011-03-28 04:50:20 +0000
committerBart Schaefer <barts@users.sourceforge.net>2011-03-28 04:50:20 +0000
commit67847a96ee2bff708b2f7b6ec25cc850f818ea46 (patch)
treeb4807171d6bf207ee59e3ccedda1118943f09ff3
parente4059eedc7e825c0711981d4035ab138b1fb21e4 (diff)
downloadzsh-67847a96ee2bff708b2f7b6ec25cc850f818ea46.tar.gz
zsh-67847a96ee2bff708b2f7b6ec25cc850f818ea46.tar.xz
zsh-67847a96ee2bff708b2f7b6ec25cc850f818ea46.zip
28926: No newline after the last line in listlist() when printing the list
in a single column.
-rw-r--r--ChangeLog7
-rw-r--r--Src/Zle/zle_tricky.c4
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  <schaefer@zsh.org>
+
+	* 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  <ft@bewatermyfriend.org>
 
 	* 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) {