From c200c78dc5f1dea42f480d70aff099e6370ad286 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 19 Feb 2008 19:23:19 +0000 Subject: [PATCH] * net/ange-ftp.el (ange-ftp-quote-string): Return the null string when the argument is nil. --- lisp/ChangeLog | 5 +++++ lisp/net/ange-ftp.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 69fe9bca1f3..a71fa2a1b75 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-02-19 Katsumi Yamaoka + + * net/ange-ftp.el (ange-ftp-quote-string): Return the null string + when the argument is nil. + 2008-02-19 Dan Nicolaescu * vc.el (dir-status): Add a brief description. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index aeb2a8dc0d5..ec138ca5d70 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1527,7 +1527,9 @@ then kill the related ftp process." ;; and that by doubling it. But experiment says UNIX-style kind of ;; quoting is correct when talking to ftp on GNU/Linux systems, and ;; W32-style kind of quoting on, yes, W32 systems. - (when (stringp string) (shell-quote-argument string))) + (if (stringp string) + (shell-quote-argument string) + "")) (defun ange-ftp-barf-if-not-directory (directory) (or (file-directory-p directory) -- 2.39.2