17318: ${(z)...} added an extra space when the lexical analyser failed.

2 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index fdc27b467..1a2eea3a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-14  Peter Stephenson  <pws@csr.com>
+
+	* 17318: Src/hist.c: ${(z)...} appended an extra space when the
+	lexical analyser failed.
+
 2002-06-07  Peter Stephenson  <pws@csr.com>
 
 	* 17304: Src/Zle/zle_main.c, Doc/Zsh/zle.yo: (suggested by Bart)
diff --git a/Src/hist.c b/Src/hist.c
index 0b9bf2c17..f1f240d3d 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -2291,7 +2291,16 @@ bufferwords(LinkList list, char *buf, int *index)
 	}
     } while (tok != ENDINPUT && tok != LEXERR);
     if (buf && tok == LEXERR && tokstr && *tokstr) {
+	int plen;
 	untokenize((p = dupstring(tokstr)));
+	plen = strlen(p);
+	/*
+	 * Strip the space we added for lexing but which won't have
+	 * been swallowed by the lexer because we aborted early.
+	 * The test is paranoia.
+	 */
+	if (plen && p[plen-1] == ' ' && (plen == 1 || p[plen-2] != Meta))
+	    p[plen - 1] = '\0';
 	addlinknode(list, p);
 	num++;
     }