Mercurial > emacs
changeset 112250:baabeab57e3e
* net/tramp.el (tramp-default-method): Initialize with pscp/plink
only when running under W32.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Mon, 10 Jan 2011 20:42:46 +0100 |
| parents | 785e3b6e720b |
| children | 014879f0bfbb |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Jan 09 19:52:57 2011 +0200 +++ b/lisp/ChangeLog Mon Jan 10 20:42:46 2011 +0100 @@ -1,3 +1,8 @@ +2011-01-10 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-default-method): Initialize with pscp/plink + only when running under W32. + 2011-01-09 Eli Zaretskii <eliz@gnu.org> * progmodes/grep.el (grep-compute-defaults): Quote the program
--- a/lisp/net/tramp.el Sun Jan 09 19:52:57 2011 +0200 +++ b/lisp/net/tramp.el Mon Jan 10 20:42:46 2011 +0100 @@ -1,7 +1,7 @@ ;;; tramp.el --- Transparent Remote Access, Multiple Protocol -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; (copyright statements below in code to be updated with the above notice) @@ -780,8 +780,11 @@ ;; password caching. "scpc" is chosen if we detect that the user is ;; running OpenSSH 4.0 or newer. (cond - ;; PuTTY is installed. - ((executable-find "pscp") + ;; PuTTY is installed. We don't take it, if it is installed on a + ;; non-windows system, or pscp from the pssh (parallel ssh) package + ;; is found. + ((and (eq system-type 'windows-nt) + (executable-find "pscp")) (if (or (fboundp 'password-read) (fboundp 'auth-source-user-or-password) ;; Pageant is running. @@ -1904,8 +1907,8 @@ (defconst tramp-perl-encode "%s -e ' # This script contributed by Juanma Barranquero <lektu@terra.es>. -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -# Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. use strict; my %%trans = do { @@ -1946,8 +1949,8 @@ (defconst tramp-perl-decode "%s -e ' # This script contributed by Juanma Barranquero <lektu@terra.es>. -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -# Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. use strict; my %%trans = do {