Commit 11d074b2 authored by Michael Albinus's avatar Michael Albinus
Browse files

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

loading.  (Bug#9114)
parent 043604ee
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> 2011-07-21 Martin Rudalics <rudalics@gmx.at>
* window.el (display-buffer-pop-up-window) * window.el (display-buffer-pop-up-window)
......
...@@ -1876,7 +1876,17 @@ Falls back to normal file name handler if no Tramp file name handler exists." ...@@ -1876,7 +1876,17 @@ Falls back to normal file name handler if no Tramp file name handler exists."
;; Call the backend function. ;; Call the backend function.
(if foreign (if foreign
(condition-case err (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. ;; Trace that somebody has interrupted the operation.
(quit (quit
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment