* net/tramp.el (tramp-default-method): Don't call `symbol-function'.

Apply `funcall' directly on 'executable-find.

1 files changed, 4 insertions, 6 deletions

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1835599a1c6..822a995230e 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -693,20 +693,18 @@ various functions for details."
   ;; 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")