# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1167577431 0
# Node ID 4b58ce68eaec2a2480db019aa071493295c5e286
# Parent  a8f469237c7e5519c4eb30608ee59315c4372a25
* net/tramp.el (tramp-default-method): Don't call `symbol-function'.
Apply `funcall' directly on 'executable-find.

diff -r a8f469237c7e -r 4b58ce68eaec lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Dec 31 00:48:53 2006 +0000
+++ b/lisp/ChangeLog	Sun Dec 31 15:03:51 2006 +0000
@@ -1,3 +1,8 @@
+2006-12-31  Romain Francoise <romain@orebokech.com>
+
+	* net/tramp.el (tramp-default-method): Don't call `symbol-function'.
+	Apply `funcall' directly on 'executable-find.
+
 2006-12-31  Kim F. Storm  <storm@cua.dk>
 
 	* files.el (auto-mode-case-fold): New defcustom.
diff -r a8f469237c7e -r 4b58ce68eaec lisp/net/tramp.el
--- a/lisp/net/tramp.el	Sun Dec 31 00:48:53 2006 +0000
+++ b/lisp/net/tramp.el	Sun Dec 31 15:03:51 2006 +0000
@@ -693,20 +693,18 @@
   ;; another good choice because of the "ControlMaster" option, but
   ;; this is a more modern alternative in OpenSSH 4, which cannot be
   ;; taken as default.
-  (let ((e-f (and (fboundp 'executable-find)
-		  (symbol-function 'executable-find))))
+  (let ((e-f (fboundp 'executable-find)))
     (cond
      ;; PuTTY is installed.
-     ((and e-f (funcall e-f "pscp"))
+     ((and e-f (funcall 'executable-find "pscp"))
       (if (or (fboundp 'password-read)
 	      ;; Pageant is running.
 	      (and (fboundp 'w32-window-exists-p)
-		   (funcall (symbol-function 'w32-window-exists-p)
-			    "Pageant" "Pageant")))
+		   (funcall 'w32-window-exists-p "Pageant" "Pageant")))
 	  "pscp"
 	"plink"))
      ;; There is an ssh installation.
-     ((and e-f (funcall e-f "scp"))
+     ((and e-f (funcall 'executable-find "scp"))
       (if (or (fboundp 'password-read)
 	      ;; ssh-agent is running.
 	      (getenv "SSH_AUTH_SOCK")