From: John Wiegley Date: Fri, 26 Aug 2005 22:39:49 +0000 (+0000) Subject: (eshell-flatten-list): Don't call eshell-flatten-list on a X-Git-Tag: emacs-pretest-22.0.90~7417 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35595517d23d675a509e843f988544930c2725c4;p=emacs.git (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 7b5186e6cd3..1c23b4b53fc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2005-08-26 John Wiegley + + * 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 * outline.el (outline-invent-heading): New fun. diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index c05f6abb23b..70179097d87 100644 --- 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))))