*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c23b4b53fcd0bbbef72b6a0400458df256e5844..659a96305ae0d87143a0ce9a52fdedb7c5aee7e0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2005-08-26  John Wiegley  <johnw@newartisans.com>
 
+       * eshell/esh-cmd.el (eshell-rewrite-named-command): Changed the
+       code around a bit so that an extraneous nil argument is not added
+       to a command when no args are given.
+
        * 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

diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 70179097d877fdceb06ac2c559b8097860e8f2d9..c05f6abb23b904e4e652dd99a3af41be376e85e0 100644 (file)
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -294,8 +294,7 @@ 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 (not (eq a nil))
-              (listp a)
+      (if (and (listp a)
               (listp (cdr a)))
          (nconc new-list (eshell-flatten-list a))
        (nconc new-list (list a))))