From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 6 Oct 2021 16:15:26 +0000 (-0400)
Subject: Backport: * lisp/net/tramp-archive.el (tramp-archive-autoload-file-name-handler)... 
X-Git-Tag: emacs-28.0.90~370
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7a10b44acf94458ed5f590be76749cec3e1b8dc;p=emacs.git

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

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 b28235924de..8bf25151dfb 100644
--- 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