summaryrefslogtreecommitdiff
path: root/lisp/eshell/esh-arg.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2005-08-26 22:35:48 +0000
committerJohn Wiegley <johnw@newartisans.com>2005-08-26 22:35:48 +0000
commitb5306f79040c1e5cf9e98ce24eaefa5621b5b0ff (patch)
tree2b94a9dadbd24f8eacafd2376d045a6127d2359b /lisp/eshell/esh-arg.el
parent5b317d749888daba0a4be5516f536fb9396438f2 (diff)
downloademacs-b5306f79040c1e5cf9e98ce24eaefa5621b5b0ff.tar.gz
(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.
Diffstat (limited to 'lisp/eshell/esh-arg.el')
-rw-r--r--lisp/eshell/esh-arg.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 7e0be3138e8..322a0173b27 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -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 ()