diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-04-16 13:43:32 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-04-16 13:43:32 -0400 |
| commit | e495a3d79b2ac0310122757694ce27b25b72d6bd (patch) | |
| tree | 361cdea4a07834de86809100ad6d1b3da74b5d12 /lisp/net/tramp-archive.el | |
| parent | e888cee1f911a8321bd784b7d3c7f573b3a67bd5 (diff) | |
| parent | aab36e18950e23100718eaedb14ef9176f5d3da2 (diff) | |
| download | emacs-e495a3d79b2ac0310122757694ce27b25b72d6bd.tar.gz emacs-e495a3d79b2ac0310122757694ce27b25b72d6bd.tar.bz2 emacs-e495a3d79b2ac0310122757694ce27b25b72d6bd.zip | |
Merge from origin/emacs-28
aab36e1895 Fix error in tramp-archive-autoload-file-name-handler
11a1f7817e Merge branch 'emacs-28' of git.sv.gnu.org:/srv/git/emacs i...
93974198b6 Commit missing file from previous commit
Diffstat (limited to 'lisp/net/tramp-archive.el')
| -rw-r--r-- | lisp/net/tramp-archive.el | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index 7f4eca3f7c7..4a020c7150f 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el @@ -362,14 +362,13 @@ arguments to pass to the OPERATION." (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 - ;; might be an older, incompatible version active. We try to - ;; overload this. - (let ((default-directory temporary-file-directory) - (tramp-archive-autoload t)) - (apply #'tramp-autoload-file-name-handler operation args))))) + (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)))) (put #'tramp-archive-autoload-file-name-handler 'tramp-autoload t) |