* net/tramp.el (tramp-file-name-handler): Avoid recursive

loading.  (Bug#9114)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a21698986709b1690ff410334387f74916c2d2c7..848d991feed71b2fb72df29cbf4aaf81bcaee09b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-22  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-file-name-handler): Avoid recursive
+       loading.  (Bug#9114)
+
 2011-07-21  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (display-buffer-pop-up-window)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 82d878a6fa8ea85987ce3cbdedb828f9a6d1f141..9b11ef58eab0e883b6004d41b3a0a4fb916a6256 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1876,7 +1876,17 @@ Falls back to normal file name handler if no Tramp file name handler exists."
            ;; Call the backend function.
            (if foreign
                (condition-case err
-                   (apply foreign operation args)
+                   (let ((sf (symbol-function foreign)))
+                     ;; Some packages set the default directory to a
+                     ;; remote path, before respective Tramp packages
+                     ;; are already loaded.  This results in
+                     ;; recursive loading.  Therefore, we load the
+                     ;; Tramp packages locally.
+                     (when (and (listp sf) (eq (car sf) 'autoload))
+                       (let ((default-directory
+                               (tramp-compat-temporary-file-directory)))
+                         (load (cadr sf) 'noerror)))
+                     (apply foreign operation args))
 
                  ;; Trace that somebody has interrupted the operation.
                  (quit