diff options
| author | Miles Bader <miles@gnu.org> | 2006-11-07 23:22:48 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-11-07 23:22:48 +0000 |
| commit | dbc3b08c405a7b1c0ddb0fb0c98164b355802af5 (patch) | |
| tree | 00c6f28244409d14bec11e221fb3c03daef63fc6 /lisp/net/tramp.el | |
| parent | bbb6e8f2b6037dc1ee4ddd6cb63a1a6ddb04a591 (diff) | |
| parent | 86cb14475e9e76f0b3323d2e7110a4a2bd310cdb (diff) | |
| download | emacs-dbc3b08c405a7b1c0ddb0fb0c98164b355802af5.tar.gz emacs-dbc3b08c405a7b1c0ddb0fb0c98164b355802af5.tar.bz2 emacs-dbc3b08c405a7b1c0ddb0fb0c98164b355802af5.zip | |
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
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 0b914a811d1..ae815b7d434 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -676,7 +676,7 @@ various functions for details." (if (and (fboundp 'executable-find) (executable-find "plink")) "plink" - "ssh") + "scp") "*Default method to use for transferring files. See `tramp-methods' for possibilities. Also see `tramp-default-method-alist'." |