From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 25 Jun 2019 20:09:48 +0000 (-0400)
Subject: * lisp/net/tramp.el (tramp-file-name-handler): Use autoload-do-load
X-Git-Tag: emacs-27.0.90~2234
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=93b823b6e4bb8d4d414a9b6a9d3d45d63cb32f70;p=emacs.git

* 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 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