diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-15 12:03:38 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-15 12:03:38 -0800 |
| commit | 362b9d483c714a8fd87966ddbd8686850f870e34 (patch) | |
| tree | e37a94fe030c9361fa28b4f3f5c8910cc7ab8448 /lisp/net/tramp.el | |
| parent | dab7376027ea499962b2916652c6f30b40eac6d9 (diff) | |
| parent | 0ad254447b7542284a2eb3c63b0732edb9409af7 (diff) | |
| download | emacs-362b9d483c714a8fd87966ddbd8686850f870e34.tar.gz | |
Merge from emacs-23 branch.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index cd9ef314acc..ef312af80ba 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -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. ;; Author: Kai Großjohann <kai.grossjohann@gmx.net> ;; Michael Albinus <michael.albinus@gmx.de> @@ -291,8 +291,11 @@ shouldn't return t when it isn't." ;; 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. |