CVS update by albinus packages/xemacs-packages/tramp/lisp ...

[xemacs-cvs at xemacs.org]

  User: albinus 
  Date: 06/12/31 15:47:23

  Modified:    packages/xemacs-packages/tramp/lisp ChangeLog tramp.el
Log:
Version 2.0.55 repackaged.

Revision  Changes    Path
1.37      +9 -0      XEmacs/packages/xemacs-packages/tramp/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ChangeLog	2006/12/30 21:03:06	1.36
+++ ChangeLog	2006/12/31 14:47:21	1.37
@@ -1,3 +1,12 @@
+2006-12-31  Michael Albinus  <michael.albinus at gmx.de>
+
+	Version 2.0.55 repackaged.
+
+2006-12-31  Romain Francoise <romain at orebokech.com>
+
+	* tramp.el (tramp-default-method): Don't call `symbol-function'.
+	Apply `funcall' directly on 'executable-find.
+
 2006-12-30  Michael Albinus  <michael.albinus at gmx.de>
 
 	Version 2.0.55 released.



1.37      +4 -6      XEmacs/packages/xemacs-packages/tramp/lisp/tramp.el

Index: tramp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/tramp.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- tramp.el	2006/12/30 21:03:06	1.36
+++ tramp.el	2006/12/31 14:47:22	1.37
@@ -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")