From d7ec1df7227dd077afd4653b33af9000e627c25c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 11 Nov 2009 14:40:18 +0000 Subject: [PATCH] * 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. --- lisp/net/tramp.el | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index fda9065c7e9..ec2ae75e151 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4209,7 +4209,13 @@ beginning of local filename are not substituted." (delete-region (point-min) (point)) (insert (substitute-in-file-name s)) (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-tilde))) @@ -8131,7 +8137,8 @@ If the `tramp-methods' entry does not exist, return NIL." (lambda () (ad-remove-advice '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 ;; permission 0666 minus umask. This is a security threat. @@ -8376,7 +8383,8 @@ Only works for Bourne-like shells." 'tramp-unload-hook (lambda () (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' ;; - Unload all `tramp-*' packages -- 2.39.2