(untranslated-canonical-name): Avoid expanding

ange-ftp file names, which might force ange-ftp to prompt for a
password.

diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index 612191c75aaec8ae822cb6a8300d8e482672b189..8e3e7862520fe28bacd570d9786e1a2dec0d2182 100644 (file)
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -208,7 +208,10 @@ dealing with untranslated filesystems."
                    filename nil))
        ;; Use expand-file-name to canonicalize directory separators, except
        ;; with bare drive letters (which would have the cwd appended).
-       (if (string-match "^.:$" name)
+       ;; Avoid expanding names that could trigger ange-ftp to prompt
+       ;; for passwords, though.
+       (if (or (string-match "^.:$" name)
+               (string-match "^/[^/:]+:" name))
            name
          (expand-file-name name)))
     filename))