andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
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
This commit is contained in:
Eli Zaretskii 2022-04-16 13:43:32 -04:00
commit e495a3d79b
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/net/tramp-archive.el
View file

@ -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)