[Emacs-diffs] emacs/lisp/net tramp.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/11/11 14:40:20

Modified files:
        lisp/net       : tramp.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.266&r2=1.267

Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -b -r1.266 -r1.267
--- tramp.el    8 Nov 2009 10:44:22 -0000       1.266
+++ tramp.el    11 Nov 2009 14:40:18 -0000      1.267
@@ -4209,7 +4209,13 @@
               (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 @@
    (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 @@
    '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