Commit d7ec1df7 authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp.el (tramp-advice-minibuffer-electric-separator)

(tramp-advice-minibuffer-electric-tilde): Unload advices via
`tramp-unload'.
(tramp-advice-make-auto-save-file-name)
(tramp-advice-file-expand-wildcards): Apply also `ad-activate'
after removing the advice.
parent 0a5d24ae
...@@ -4209,7 +4209,13 @@ beginning of local filename are not substituted." ...@@ -4209,7 +4209,13 @@ beginning of local filename are not substituted."
(delete-region (point-min) (point)) (delete-region (point-min) (point))
(insert (substitute-in-file-name s)) (insert (substitute-in-file-name s))
(setq ad-return-value last-command-char)) (setq ad-return-value last-command-char))
ad-do-it)))) ad-do-it)))
(eval
`(add-hook
'tramp-unload-hook
(lambda ()
(ad-remove-advice ',x 'around ',(intern (format "tramp-advice-%s" x)))
(ad-activate ',x)))))
'(minibuffer-electric-separator '(minibuffer-electric-separator
minibuffer-electric-tilde))) minibuffer-electric-tilde)))
...@@ -8131,7 +8137,8 @@ If the `tramp-methods' entry does not exist, return NIL." ...@@ -8131,7 +8137,8 @@ If the `tramp-methods' entry does not exist, return NIL."
(lambda () (lambda ()
(ad-remove-advice (ad-remove-advice
'make-auto-save-file-name 'make-auto-save-file-name
'around 'tramp-advice-make-auto-save-file-name)))) 'around 'tramp-advice-make-auto-save-file-name)
(ad-activate 'make-auto-save-file-name))))
;; In Emacs < 22 and XEmacs < 21.5 autosaved remote files have ;; In Emacs < 22 and XEmacs < 21.5 autosaved remote files have
;; permission 0666 minus umask. This is a security threat. ;; permission 0666 minus umask. This is a security threat.
...@@ -8376,7 +8383,8 @@ Only works for Bourne-like shells." ...@@ -8376,7 +8383,8 @@ Only works for Bourne-like shells."
'tramp-unload-hook 'tramp-unload-hook
(lambda () (lambda ()
(ad-remove-advice (ad-remove-advice
'file-expand-wildcards 'around 'tramp-advice-file-expand-wildcards)))) 'file-expand-wildcards 'around 'tramp-advice-file-expand-wildcards)
(ad-activate 'file-expand-wildcards))))
;; Checklist for `tramp-unload-hook' ;; Checklist for `tramp-unload-hook'
;; - Unload all `tramp-*' packages ;; - Unload all `tramp-*' packages
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment