(uniquify-rationalize-file-buffer-names, rename-buffer)

(uniquify-delay-rationalize-file-buffer-names, kill-buffer-hook):
Undo 2002/09/27 change, because kill-buffer-hook is not permanent-local.

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 25f931868e9d33294deab1e017453cf53706c8ba..28f231a1e42360d7745c3e11a7561f3f7cf76768 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -209,13 +209,6 @@ Arguments NEWBUFFILE and NEWBUF cause only a subset of buffers to be renamed."
                                 rawname bfn uniquify-min-dir-content)))
            (push (vector rawname bfn buffer proposed) fix-list)
          (push bufname uniquify-non-file-buffer-names))))
-    ;; Set up uniquify to re-rationalize after killing/renaming
-    ;; if there is a conflict.
-    (when (and uniquify-after-kill-buffer-p newbuffile (cdr fix-list))
-      (dolist (fix fix-list)
-       (with-current-buffer (uniquify-ref-buffer fix)
-         (add-hook 'kill-buffer-hook
-                   'uniquify-delay-rationalize-file-buffer-names nil t))))
     ;; selects buffers whose names may need changing, and others that
     ;; may conflict, then bring conflicting names together
     (uniquify-rationalize-a-list fix-list uniquify-min-dir-content)))
@@ -368,8 +361,7 @@ in `uniquify-list-buffers-directory-modes', otherwise returns nil."
           ;; UNIQUE argument
           (ad-get-arg 1))
       (progn
-       (if (memq 'uniquify-delay-rationalize-file-buffer-names
-                 kill-buffer-hook)
+       (if uniquify-after-kill-buffer-p
            ;; call with no argument; rationalize vs. old name as well as new
            (uniquify-rationalize-file-buffer-names)
          ;; call with argument: rationalize vs. new name only
@@ -397,7 +389,9 @@ in `uniquify-list-buffers-directory-modes', otherwise returns nil."
   "Add `delayed-uniquify-rationalize-file-buffer-names' to `post-command-hook'.
 For use on, eg, `kill-buffer-hook', to rationalize *after* buffer deletion."
   (if (and uniquify-buffer-name-style
-          uniquify-after-kill-buffer-p)
+          uniquify-after-kill-buffer-p
+          ;; Rationalizing is costly, so don't do it for temp buffers.
+          (uniquify-buffer-file-name (current-buffer)))
       (add-hook 'post-command-hook
                'uniquify-delayed-rationalize-file-buffer-names)))
 
@@ -408,4 +402,6 @@ See also `delay-rationalize-file-buffer-names' for hook setter."
   (remove-hook 'post-command-hook
               'uniquify-delayed-rationalize-file-buffer-names))
 
+(add-hook 'kill-buffer-hook 'uniquify-delay-rationalize-file-buffer-names)
+
 ;;; uniquify.el ends here