# HG changeset patch
# User John Wiegley <johnw@newartisans.com>
# Date 1125096688 0
# Node ID b93526432c17d471f1ab669479e4e6c78a409ac3
# Parent  2980740e3f1c004de2ccbbd611fdd6df7b145404
*** empty log message ***

diff -r 2980740e3f1c -r b93526432c17 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 26 22:51:03 2005 +0000
+++ b/lisp/ChangeLog	Fri Aug 26 22:51:28 2005 +0000
@@ -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 -r 2980740e3f1c -r b93526432c17 lisp/eshell/esh-util.el
--- a/lisp/eshell/esh-util.el	Fri Aug 26 22:51:03 2005 +0000
+++ b/lisp/eshell/esh-util.el	Fri Aug 26 22:51:28 2005 +0000
@@ -294,8 +294,7 @@
   "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))))