procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix newly introduced errors in Tramp

Browse source 
* 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.
This commit is contained in:
Michael Albinus 2020-06-19 09:24:27 +02:00
parent 6fe5c21c72
commit 70ac80d756
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/net/tramp-gvfs.el
View file

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

4
lisp/net/tramp.el
View file

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