(eshell-flatten-list): Don't call eshell-flatten-list on a

sub-argument if it is eq to nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b5186e6cd3d6add97b8dd4b8a22c02261250c3e..1c23b4b53fcd0bbbef72b6a0400458df256e5844 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-26  John Wiegley  <johnw@newartisans.com>
+
+       * eshell/esh-arg.el (eshell-parse-double-quote): If a
+       double-quoted argument resolves to nil, return it as an empty
+       string rather than as nil.  This made it impossible to pass "" to
+       a shell script as a null string argument.
+
 2005-08-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * outline.el (outline-invent-heading): New fun.

diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index c05f6abb23b904e4e652dd99a3af41be376e85e0..70179097d877fdceb06ac2c559b8097860e8f2d9 100644 (file)
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -294,7 +294,8 @@ If N or M is nil, it means the end of the list."
   "Flatten any lists within ARGS, so that there are no sublists."
   (let ((new-list (list t)))
     (eshell-for a args
-      (if (and (listp a)
+      (if (and (not (eq a nil))
+              (listp a)
               (listp (cdr a)))
          (nconc new-list (eshell-flatten-list a))
        (nconc new-list (list a))))