diff options
| author | Andrew Innes <andrewi@gnu.org> | 1999-07-01 19:42:42 +0000 |
|---|---|---|
| committer | Andrew Innes <andrewi@gnu.org> | 1999-07-01 19:42:42 +0000 |
| commit | 97a1a46f05135a017ef3b54637493dbabc93d1f6 (patch) | |
| tree | c746a3dee1bc1833b378b08f70e20bbd919b26af /lisp/dos-w32.el | |
| parent | 0fe2a56db73980def5b2263906b27add89fce0ab (diff) | |
| download | emacs-97a1a46f05135a017ef3b54637493dbabc93d1f6.tar.gz | |
(untranslated-canonical-name): Avoid expanding
ange-ftp file names, which might force ange-ftp to prompt for a
password.
Diffstat (limited to 'lisp/dos-w32.el')
| -rw-r--r-- | lisp/dos-w32.el | 5 |
1 files changed, 4 insertions, 1 deletions
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)) |