summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2019-06-25 16:09:48 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2019-06-25 16:09:48 -0400
commit93b823b6e4bb8d4d414a9b6a9d3d45d63cb32f70 (patch)
tree486b0fa4ee15ede9fed437e720f46f80aeccc2a4
parent0ab24743f1702aa52bb0bcb18798c698cc792da3 (diff)
downloademacs-93b823b6e4bb8d4d414a9b6a9d3d45d63cb32f70.tar.gz
emacs-93b823b6e4bb8d4d414a9b6a9d3d45d63cb32f70.tar.bz2
emacs-93b823b6e4bb8d4d414a9b6a9d3d45d63cb32f70.zip
* lisp/net/tramp.el (tramp-file-name-handler): Use autoload-do-load
-rw-r--r--lisp/net/tramp.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0a5ccb6f1c6..4c9b67b13b4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2317,10 +2317,14 @@ Falls back to normal file name handler if no Tramp file name handler exists."
;; in recursive loading. Therefore, we load
;; the Tramp packages locally.
(when (autoloadp sf)
+ ;; FIXME: Not clear why we need these bindings here.
+ ;; The explanation above is not convincing and
+ ;; the bug#9114 for which it was added doesn't
+ ;; clarify the core of the problem.
(let ((default-directory
(tramp-compat-temporary-file-directory))
file-name-handler-alist)
- (load (cadr sf) 'noerror 'nomessage)))
+ (autoload-do-load sf foreign)))
;; (tramp-message
;; v 4 "Running `%s'..." (cons operation args))
;; If `non-essential' is non-nil, Tramp shall