[Emacs-diffs] Changes to emacs/lisp/net/tramp-ftp.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/11/07 20:41:15

Index: net/tramp-ftp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-ftp.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- net/tramp-ftp.el    4 Oct 2007 20:09:32 -0000       1.21
+++ net/tramp-ftp.el    7 Nov 2007 20:41:14 -0000       1.22
@@ -143,10 +143,13 @@
        ;; cannot disable the file-name-handler this case.  We set the
        ;; connection property "started" in order to put the remote
        ;; location into the cache, which is helpful for further
-       ;; completion.
+       ;; completion.  We don't use `with-parsed-tramp-file-name',
+       ;; because this returns another user but the one declared in
+       ;; "~/.netrc".
        ((memq operation '(file-directory-p file-exists-p))
        (if (apply 'ange-ftp-hook-function operation args)
-           (with-parsed-tramp-file-name (car args) nil
+           (let ((v (tramp-dissect-file-name (car args) t)))
+             (aset v 0 tramp-ftp-method)
              (tramp-set-connection-property v "started" t))
          nil))
        ;; If the second argument of `copy-file' or `rename-file' is a