diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c0eac60c44f..981ed383dd4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-11-07 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-default-method): scp is the default method. | ||
| 4 | |||
| 1 | 2006-11-07 Juanma Barranquero <lekktu@gmail.com> | 5 | 2006-11-07 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * server.el (server-start): Save also the Emacs pid in the server file. | 7 | * server.el (server-start): Save also the Emacs pid in the server file. |
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." | |||
| 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'." |