Commit 6a0ecd86 authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp.el (tramp-default-method): Initialize with pscp/plink

only when running under W32.
parent 88ecd0a5
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> 2011-01-09 Eli Zaretskii <eliz@gnu.org>
* progmodes/grep.el (grep-compute-defaults): Quote the program * progmodes/grep.el (grep-compute-defaults): Quote the program
......
;;; tramp.el --- Transparent Remote Access, Multiple Protocol ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; (copyright statements below in code to be updated with the above notice) ;; (copyright statements below in code to be updated with the above notice)
...@@ -780,8 +780,11 @@ shouldn't return t when it isn't." ...@@ -780,8 +780,11 @@ shouldn't return t when it isn't."
;; password caching. "scpc" is chosen if we detect that the user is ;; password caching. "scpc" is chosen if we detect that the user is
;; running OpenSSH 4.0 or newer. ;; running OpenSSH 4.0 or newer.
(cond (cond
;; PuTTY is installed. ;; PuTTY is installed. We don't take it, if it is installed on a
((executable-find "pscp") ;; 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) (if (or (fboundp 'password-read)
(fboundp 'auth-source-user-or-password) (fboundp 'auth-source-user-or-password)
;; Pageant is running. ;; Pageant is running.
...@@ -1904,8 +1907,8 @@ on the remote host.") ...@@ -1904,8 +1907,8 @@ on the remote host.")
(defconst tramp-perl-encode (defconst tramp-perl-encode
"%s -e ' "%s -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>. # This script contributed by Juanma Barranquero <lektu@terra.es>.
# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# Free Software Foundation, Inc. # 2011 Free Software Foundation, Inc.
use strict; use strict;
my %%trans = do { my %%trans = do {
...@@ -1946,8 +1949,8 @@ This string is passed to `format', so percent characters need to be doubled.") ...@@ -1946,8 +1949,8 @@ This string is passed to `format', so percent characters need to be doubled.")
(defconst tramp-perl-decode (defconst tramp-perl-decode
"%s -e ' "%s -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>. # This script contributed by Juanma Barranquero <lektu@terra.es>.
# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# Free Software Foundation, Inc. # 2011 Free Software Foundation, Inc.
use strict; use strict;
my %%trans = do { my %%trans = do {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment