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)))
;; 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
"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)))
(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