From: Andrew Innes <andrewi@gnu.org>
Date: Thu, 1 Jul 1999 19:42:42 +0000 (+0000)
Subject: (untranslated-canonical-name): Avoid expanding
X-Git-Tag: emacs-20.4~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97a1a46f05135a017ef3b54637493dbabc93d1f6;p=emacs.git

(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 612191c75aa..8e3e7862520 100644
--- 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))