Backport: * lisp/net/tramp-archive.el (tramp-archive-autoload-file-name-handler)...

Fix the scoping of `tramp-archive-enabled`.

(cherry picked from commit 8d53c23f90aab6e527c61137ae43274c7a36eca7)

diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index b28235924deb3e1a57c9d644f81d33740f9ce888..8bf25151dfbba4084431344344ed0487aabdaa83 100644 (file)
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -353,6 +353,7 @@ arguments to pass to the OPERATION."
 ;;;###autoload
 (progn (defun tramp-archive-autoload-file-name-handler (operation &rest args)
   "Load Tramp archive file name handler, and perform OPERATION."
+  (defvar tramp-archive-autoload)
   (when tramp-archive-enabled
     ;; We cannot use `tramp-compat-temporary-file-directory' here due
     ;; to autoload.  When installing Tramp's GNU ELPA package, there
@@ -360,7 +361,6 @@ arguments to pass to the OPERATION."
     ;; overload this.
     (let ((default-directory temporary-file-directory)
           (tramp-archive-autoload t))
-      tramp-archive-autoload ; Silence byte compiler.
       (apply #'tramp-autoload-file-name-handler operation args)))))
 
 ;;;###autoload