(ange-ftp-canonicalize-filename): Do not use a UNC

path as a default directory when canonicalizing names.

diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index 6e3e0f51686976e381eff2b5e9dcbe3f99fbf68c..5c3eb4efd7f51e1e0e2d23cdd671a79339ed9a36 100644 (file)
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -3017,11 +3017,15 @@ logged in as user USER and cd'd to directory DIR."
          ;; If name starts with //, preserve that, for apollo system.
          (if (not (string-match "^//" name))
              (progn
-               (setq name (ange-ftp-real-expand-file-name name))
-               ;; Strip off drive specifier added on windows-nt
-               (if (and (eq system-type 'windows-nt)
-                        (string-match "^[a-zA-Z]:" name))
-                   (setq name (substring name 2)))
+               (if (not (eq system-type 'windows-nt))
+                   (setq name (ange-ftp-real-expand-file-name name))
+                 ;; Windows UNC default dirs do not make sense for ftp.
+                 (if (string-match "^//" default-directory)
+                     (setq name (ange-ftp-real-expand-file-name name "c:/"))
+                   (setq name (ange-ftp-real-expand-file-name name)))
+                 ;; Strip off possible drive specifier.
+                 (if (string-match "^[a-zA-Z]:" name)
+                     (setq name (substring name 2))))
                (if (string-match "^//" name)
                    (setq name (substring name 1)))))