Merged from emacs@sv.gnu.org

[gnu-emacs] / lisp / eshell / esh-arg.el

diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 7e0be3138e88ba1df0ad9adb8b819a31990c6f1c..9a5ead5ddffbd7347297ff05bdae25b341692055 100644 (file)
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -1,7 +1,7 @@
 ;;; esh-arg.el --- argument processing
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -342,8 +342,10 @@ special character that is not itself a backslash."
            (save-restriction
              (forward-char)
              (narrow-to-region (point) end)
-             (list 'eshell-escape-arg
-                   (eshell-parse-argument)))
+             (let ((arg (eshell-parse-argument)))
+               (if (eq arg nil)
+                   ""
+                 (list 'eshell-escape-arg arg))))
          (goto-char (1+ end)))))))
 
 (defun eshell-parse-special-reference ()