* lisp/net/tramp.el (tramp-file-name-handler): Use autoload-do-load

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0a5ccb6f1c6b887b89a968c01b69670cd43cc136..4c9b67b13b48e06c9ad293c6332f657cf7d3df8e 100644 (file)
--- 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