>From d1182bca9737129c0b517b4370f0ddc52f11dcad Mon Sep 17 00:00:00 2001 From: Felix Dietrich Date: Thu, 7 Apr 2022 17:43:10 +0200 Subject: [PATCH] Make tramp-archive-autoload-file-name-handler an alias MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/net/tramp-archive.el (tramp-archive-autoload-file-name-handler): Make ‘tramp-archive-autoload-file-name-handler’ an alias of ‘tramp-autoload-file-name-handler’. This reverts the changes to this file introduced by “Fix bug#48476” on 22. May 2021. * lisp/net/tramp.el (tramp-autoload-file-name-handler): Use ‘tramp-archive-enabled’ instead of ‘tramp-archive-autoload’. --- lisp/net/tramp-archive.el | 12 ++---------- lisp/net/tramp.el | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index 4b649edaab..cc7d6b3694 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el @@ -353,16 +353,8 @@ arguments to pass to the OPERATION." (tramp-archive-run-real-handler operation args))))))) ;;;###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) - (let (;; We cannot use `tramp-compat-temporary-file-directory' here - ;; due to autoload. When installing Tramp's GNU ELPA package, - ;; there might be an older, incompatible version active. We - ;; try to overload this. - (default-directory temporary-file-directory) - (tramp-archive-autoload tramp-archive-enabled)) - (apply #'tramp-autoload-file-name-handler operation args)))) +(defalias 'tramp-archive-autoload-file-name-handler + #'tramp-autoload-file-name-handler) (put #'tramp-archive-autoload-file-name-handler 'tramp-autoload t) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a24d83f876..72ce862dc4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2678,7 +2678,7 @@ Falls back to normal file name handler if no Tramp file name handler exists." ;; might be an older, incompatible version active. We try to ;; overload this. (let ((default-directory temporary-file-directory)) - (when (bound-and-true-p tramp-archive-autoload) + (when (bound-and-true-p tramp-archive-enabled) (load "tramp-archive" 'noerror 'nomessage)) (load "tramp" 'noerror 'nomessage))) (apply operation args))) -- 2.35.1