* net/ange-ftp.el (ange-ftp-quote-string): Return the null string

when the argument is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69fe9bca1f3f3d590ee1d7ed7a214fde29e02c8a..a71fa2a1b75d459b23b9fb25ee768fedf691a851 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * net/ange-ftp.el (ange-ftp-quote-string): Return the null string
+       when the argument is nil.
+
 2008-02-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc.el (dir-status): Add a brief description.

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index aeb2a8dc0d526036b3b2ea3f75f356e3954ab1e7..ec138ca5d70f3eb143602fb519271d0a7b48d0d4 100644 (file)
--- 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)