[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       06/12/31 15:03:51

Index: net/tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- net/tramp.el        30 Dec 2006 16:17:09 -0000      1.114
+++ net/tramp.el        31 Dec 2006 15:03:51 -0000      1.115
@@ -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")