[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 70ac80d: Fix newly introduced errors in Tramp
From: |
Michael Albinus |
Subject: |
master 70ac80d: Fix newly introduced errors in Tramp |
Date: |
Fri, 19 Jun 2020 03:24:36 -0400 (EDT) |
branch: master
commit 70ac80d75684819b633417b87bf13e1e4e15dd15
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Fix newly introduced errors in Tramp
* lisp/net/tramp-gvfs.el (tramp-gvfs-unload-hook):
Remove `tramp-gvfs-dbus-event-error' from `dbus-event-error-functions'.
* lisp/net/tramp.el (tramp-autoload-file-name-handler): Revert patch.
---
lisp/net/tramp-gvfs.el | 4 ++++
lisp/net/tramp.el | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 36166ad..dce6edd 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -951,6 +951,10 @@ is no information where to trace the message.")
(tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err))))
(add-hook 'dbus-event-error-functions #'tramp-gvfs-dbus-event-error)
+(add-hook 'tramp-gvfs-unload-hook
+ (lambda ()
+ (remove-hook 'dbus-event-error-functions
+ #'tramp-gvfs-dbus-event-error)))
;; File name primitives.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 7bb9e42..9314c43 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2450,7 +2450,9 @@ Falls back to normal file name handler if no Tramp file
name handler exists."
"Load Tramp file name handler, and perform OPERATION."
(tramp-unload-file-name-handlers)
(when tramp-mode
- (let ((default-directory (tramp-compat-temporary-file-directory)))
+ ;; We cannot use `tramp-compat-temporary-file-directory' here due
+ ;; to autoload.
+ (let ((default-directory temporary-file-directory))
(load "tramp" 'noerror 'nomessage)))
(apply operation args)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 70ac80d: Fix newly introduced errors in Tramp,
Michael Albinus <=