2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index de1aa88d5..a212ab627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-17  Peter Stephenson  <pws@csr.com>
+
+	* 18864: Src/lex.c: unnecessary spaces with empty substitutions
+	when using ${(Q)...} flag.
+
 2003-07-17  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
 
 	* 18863: Completion/Unix/Command/_aap: new completion for aap
diff --git a/Src/lex.c b/Src/lex.c
index 8c6ae71c0..495d759d4 100644
--- a/Src/lex.c
+++ b/Src/lex.c
@@ -1512,7 +1512,7 @@ parse_subst_string(char *s)
 {
     int c, l = strlen(s), err, olen;
 
-    if (! *s)
+    if (!*s || !strcmp(s, nulstring))
 	return 0;
     lexsave();
     untokenize(s);