[Emacs-diffs] Changes to emacs/lisp/uniquify.el,v [EMACS_22_BASE]

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Juanma Barranquero <lektu>      07/10/29 13:25:09

Index: uniquify.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/uniquify.el,v
retrieving revision 1.62.2.4
retrieving revision 1.62.2.5
diff -u -b -r1.62.2.4 -r1.62.2.5
--- uniquify.el 29 Oct 2007 11:59:27 -0000      1.62.2.4
+++ uniquify.el 29 Oct 2007 13:25:08 -0000      1.62.2.5
@@ -473,6 +473,26 @@
         (file-name-nondirectory filename)
         (file-name-directory filename) ad-return-value))))
 
+;;; The End
+
+(defun uniquify-unload-function ()
+  (save-current-buffer
+    (let ((buffers nil))
+      (dolist (buf (buffer-list))
+       (set-buffer buf)
+       (when uniquify-managed
+         (push (cons buf (uniquify-item-base (car uniquify-managed))) 
buffers)))
+      (dolist (fun '(rename-buffer create-file-buffer))
+       (ad-remove-advice fun 'after (intern (concat (symbol-name fun) 
"-uniquify")))
+       (ad-update fun))
+      (dolist (buf buffers)
+       (set-buffer (car buf))
+       (rename-buffer (cdr buf) t))))
+  ;; continue standard uploading
+  nil)
+
+(defvar uniquify-unload-function 'uniquify-unload-function)
+
 (provide 'uniquify)
 
 ;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065