Mercurial > emacs
comparison lisp/net/tramp.el @ 90650:02cf29720f31
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 490-504)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 161-163)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 07 Nov 2006 23:22:48 +0000 |
parents | 7eeafaaa9eab 2889a065b1d4 |
children | dbe3f29e61d6 |
comparison
equal
deleted
inserted
replaced
90649:d53934e7ddef | 90650:02cf29720f31 |
---|---|
674 | 674 |
675 (defcustom tramp-default-method | 675 (defcustom tramp-default-method |
676 (if (and (fboundp 'executable-find) | 676 (if (and (fboundp 'executable-find) |
677 (executable-find "plink")) | 677 (executable-find "plink")) |
678 "plink" | 678 "plink" |
679 "ssh") | 679 "scp") |
680 "*Default method to use for transferring files. | 680 "*Default method to use for transferring files. |
681 See `tramp-methods' for possibilities. | 681 See `tramp-methods' for possibilities. |
682 Also see `tramp-default-method-alist'." | 682 Also see `tramp-default-method-alist'." |
683 :group 'tramp | 683 :group 'tramp |
684 :type 'string) | 684 :type 'string) |