[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master fc87cdf: Adapt tramp-archive-autoload-file-name-handler
From: |
Michael Albinus |
Subject: |
master fc87cdf: Adapt tramp-archive-autoload-file-name-handler |
Date: |
Sun, 23 May 2021 06:34:44 -0400 (EDT) |
branch: master
commit fc87cdf95986667bf083fdab01df20a6a07d5d0f
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Adapt tramp-archive-autoload-file-name-handler
* lisp/net/tramp-archive.el (tramp-archive-autoload-file-name-handler):
Bind `default-directory' to safe value.
---
lisp/net/tramp-archive.el | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index a370094..d2ee729 100644
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -347,10 +347,15 @@ 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."
- (if tramp-archive-enabled
- (let ((tramp-archive-autoload t))
- tramp-archive-autoload ; Silence byte compiler.
- (apply #'tramp-autoload-file-name-handler operation args)))))
+ (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))
+ tramp-archive-autoload ; Silence byte compiler.
+ (apply #'tramp-autoload-file-name-handler operation args)))))
;;;###autoload
(progn (defun tramp-register-archive-file-name-handler ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master fc87cdf: Adapt tramp-archive-autoload-file-name-handler,
Michael Albinus <=