(delay-uniquify-rationalize-file-buffer-names):

Don't delete this function from kill-buffer-hook, if it is disabled.

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 3ece1e285379b218e97906c2c658500e9856b55a..8bb0b734bad026269b0075b5a91036e3e50fb303 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -413,9 +413,7 @@ For use on, eg, `kill-buffer-hook', to rationalize *after* buffer deletion."
   (if (and uniquify-buffer-name-style
           uniquify-after-kill-buffer-p)
       (add-hook 'post-command-hook
-               'delayed-uniquify-rationalize-file-buffer-names)
-    (remove-hook 'kill-buffer-hook
-                'delay-uniquify-rationalize-file-buffer-names)))
+               'delayed-uniquify-rationalize-file-buffer-names)))
 
 (defun delayed-uniquify-rationalize-file-buffer-names ()
   "Rerationalize buffer names and remove self from `post-command-hook'.