diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-12-02 20:34:31 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-12-02 20:34:31 +0100 |
| commit | 66feec8bbe23ad4979905e9f6fae807b27cc33de (patch) | |
| tree | 771481b70f95ae961dc9f3fb5efa420abcaf244b /lisp/net/tramp-ftp.el | |
| parent | 05907bb3aa0e68c594a0a06c5adaa75fe9817fbf (diff) | |
* net/tramp.el (tramp-local-host-regexp): Add "localhost6".
(tramp-file-name-port): Check also for `tramp-default-port'.
(tramp-get-connection-name): New defun.
(tramp-get-connection-process): Use it.
(tramp-debug-message): Extend function exclude list.
(tramp-drop-volume-letter): Fix doc string.
* net/tramp-cmds.el: Remove solved todo item.
* net/tramp-efs.el:
* net/tramp-ftp.el:
* net/tramp-gvfs.el:
* net/tramp-gw.el:
* net/tramp-imap.el:
* net/tramp-smb.el: Fix regexps added to `tramp-default-method-alist'
and `tramp-default-user-alist', respectively.
* net/tramp-gw.el (tramp-gw-open-connection): Use
`tramp-get-connection-name' and `tramp-get-connection-buffer'.
* net/tramp-imap.el (tramp-imap-make-iht): Use just
`tramp-file-name-port'.
* net/tramp-sh.el (tramp-methods): Add recursive options to "pscp"
and "psftp". Exchange "%k" marker with options.
(tramp-do-copy-or-rename-file, tramp-sh-handle-file-local-copy):
Compute size of link target.
(tramp-do-copy-or-rename-file-out-of-band). Move setting of
`tramp-current-*' up due to gateway methods. Optimze computing of
copy arguments. Use `tramp-get-connection-name' and
`tramp-get-connection-buffer'. Improve debug messages.
(tramp-compute-multi-hops): Remove port determination.
(tramp-maybe-open-connection): Use `tramp-get-connection-name'.
* net/trampver.el: Update release number.
Diffstat (limited to 'lisp/net/tramp-ftp.el')
| -rw-r--r-- | lisp/net/tramp-ftp.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el index 7f8b7454caf..a0db0199412 100644 --- a/lisp/net/tramp-ftp.el +++ b/lisp/net/tramp-ftp.el @@ -107,11 +107,11 @@ present for backward compatibility." (unless (featurep 'xemacs) (add-to-list 'tramp-methods (cons tramp-ftp-method nil))) -;; Add some defaults for `tramp-default-method-alist' +;; Add some defaults for `tramp-default-method-alist'. (add-to-list 'tramp-default-method-alist - (list "\\`ftp\\." "" tramp-ftp-method)) + (list "\\`ftp\\." nil tramp-ftp-method)) (add-to-list 'tramp-default-method-alist - (list "" "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method)) + (list nil "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method)) ;; Add completion function for FTP method. (tramp-set-completion-function @@ -221,5 +221,4 @@ pass to the OPERATION." ;; * There are no backup files on FTP hosts. -;; arch-tag: 759fb338-5c63-4b99-bd36-b4d59db91cff ;;; tramp-ftp.el ends here |