;;; uniquify.el --- unique buffer names dependent on file name
-;; Copyright (c) 1989, 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (c) 1989, 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
;; Author: Dick King <king@reasoning.com>
;; Maintainer: FSF
+;; Keywords: files
;; Created: 15 May 86
;; This file is part of GNU Emacs.
;; A version of uniquify.el that works under Emacs 18, Emacs 19, XEmacs,
;; and InfoDock is available from the maintainer.
-;; Doesn't work under NT when backslash is used as a path separator (forward
-;; slash path separator works fine). To fix, check system-type against
-;; 'windows-nt, write a routine that breaks paths down into components.
-;; (Surprisingly, there isn't one built in.)
-
;;; Change Log:
;; Originally by Dick King <king@reasoning.com> 15 May 86
-;; Converted for Emacs 18 by Stephen Gildea <gildea@lcs.mit.edu>
+;; Converted for Emacs 18 by Stephen Gildea <gildea@stop.mail-abuse.org>
;; Make uniquify-min-dir-content 0 truly non-invasive. gildea 23 May 89
;; Some cleanup. uniquify-min-dir-content default 0. gildea 01 Jun 89
;; Don't rename to "". Michael Ernst <mernst@theory.lcs.mit.edu> 15 Jun 94
;; Andre Srinivasan <andre@visigenic.com> 9 Sep 97
;; Add uniquify-list-buffers-directory-modes
;; Stefan Monnier <monnier@cs.yale.edu> 17 Nov 2000
-;; Algorithm change reduced consing when using lots of buffers
+;; Algorithm and data structure changed to reduce consing with lots of buffers
;; Francesco Potortì <pot@gnu.org> (ideas by rms and monnier) 2001-07-18
;; Valuable feedback was provided by
(file-name-nondirectory (directory-file-name file-name)))
;; uniquify-fix-list data structure
-(defalias 'uniquify-fix-item-base 'car)
-(defalias 'uniquify-fix-item-filename 'cadr)
-(defsubst uniquify-fix-item-buffer (x) (car (cdr (cdr x))))
-(defsubst uniquify-fix-item-proposed (x) (nth 3 x))
-(defsubst uniquify-set-proposed (x p) (setcar (nthcdr 3 x) p))
+(defsubst uniquify-ref-base (x) (aref x 0))
+(defsubst uniquify-ref-filename (x) (aref x 1))
+(defsubst uniquify-ref-buffer (x) (aref x 2))
+(defsubst uniquify-ref-proposed (x) (aref x 3))
+(defsubst uniquify-set-proposed (x p) (aset x 3 p))
;; Internal variables used free
(defvar uniquify-non-file-buffer-names nil)
(defun uniquify-rationalize-file-buffer-names (&optional newbuffile newbuf)
"Make file buffer names unique by adding segments from file name.
If `uniquify-min-dir-content' > 0, always pulls that many
-file name elements. Arguments cause only a subset of buffers to be renamed."
+file name elements.
+Arguments NEWBUFFILE and NEWBUF cause only a subset of buffers to be renamed."
(interactive)
(let (fix-list
uniquify-non-file-buffer-names
(setq bfn (if (eq buffer newbuf)
(when newbuffile
(expand-file-name
- (if (file-directory-p newbuffile)
- (directory-file-name newbuffile)
- newbuffile)))
+ (directory-file-name newbuffile)))
(uniquify-buffer-file-name buffer)))
(setq rawname (uniquify-file-name-nondirectory bfn))
(or (not newbuffile)
(equal rawname newbuffile-nd))
(setq proposed (uniquify-get-proposed-name
rawname bfn uniquify-min-dir-content)))
- (push (list rawname bfn buffer proposed) fix-list)
- (push (list bufname) uniquify-non-file-buffer-names))))
+ (push (vector rawname bfn buffer proposed) fix-list)
+ (push bufname uniquify-non-file-buffer-names))))
;; 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)))
dired-directory)))))))))
(defun uniquify-item-greaterp (item1 item2)
- (string-lessp (uniquify-fix-item-proposed item2)
- (uniquify-fix-item-proposed item1)))
+ (string-lessp (uniquify-ref-proposed item2)
+ (uniquify-ref-proposed item1)))
(defun uniquify-rationalize-a-list (fix-list depth)
(let (conflicting-sublist ; all elements have the same proposed name
- (old-name "")
- proposed-name)
+ (old-proposed "")
+ proposed)
(dolist (item (sort fix-list 'uniquify-item-greaterp))
- (setq proposed-name (uniquify-fix-item-proposed item))
- (unless (equal proposed-name old-name)
+ (setq proposed (uniquify-ref-proposed item))
+ (unless (equal proposed old-proposed)
(uniquify-rationalize-conflicting-sublist conflicting-sublist
- old-name depth)
+ old-proposed depth)
(setq conflicting-sublist nil))
(push item conflicting-sublist)
- (setq old-name proposed-name))
- (uniquify-rationalize-conflicting-sublist
- conflicting-sublist old-name depth)))
+ (setq old-proposed proposed))
+ (uniquify-rationalize-conflicting-sublist conflicting-sublist
+ old-proposed depth)))
(defun uniquify-get-proposed-name (base filename depth)
- (let (index
- (extra-string "")
- (fn filename)
+ (assert (equal base (uniquify-file-name-nondirectory filename)))
+ (assert (equal (directory-file-name filename) filename))
+
+ ;; Distinguish directories by adding extra separator.
+ (if (and uniquify-trailing-separator-p
+ (file-directory-p filename)
+ (not (string-equal base "")))
+ (cond ((eq uniquify-buffer-name-style 'forward)
+ (setq base (file-name-as-directory base)))
+ ;; (setq base (concat base "/")))
+ ((eq uniquify-buffer-name-style 'reverse)
+ (setq base (concat (or uniquify-separator "\\") base)))))
+
+ (let ((extra-string nil)
(n depth))
- (while (and (> n 0)
- (setq index (string-match
- (concat "\\(^\\|/[^/]*\\)/"
- (regexp-quote extra-string)
- (regexp-quote base)
- "\\'")
- fn)))
- (setq extra-string (substring fn
- (if (zerop index) 0 (1+ index))
- ;; (- (length base)) fails for base = "".
- ;; Equivalently, we could have used
- ;; (apply 'substring ...
- ;; (and (not (string= "" base))
- ;; (list (- (length base)))))
- (- (length fn) (length base)))
- n (1- n)))
- (if (zerop n) (setq uniquify-possibly-resolvable t))
-
-
- ;; Distinguish directories by adding extra separator.
- (if (and uniquify-trailing-separator-p
- (file-directory-p fn)
- (not (string-equal base "")))
- (cond ((eq uniquify-buffer-name-style 'forward)
- (setq base (concat base "/")))
- ((eq uniquify-buffer-name-style 'reverse)
- (setq base (concat (or uniquify-separator "\\") base)))))
-
- ;; Trim trailing separator on directory part
- (if (and (not (string-equal extra-string ""))
- (or (eq uniquify-buffer-name-style 'post-forward)
- (eq uniquify-buffer-name-style 'post-forward-angle-brackets)))
- (setq extra-string (substring extra-string 0
- (- (length extra-string) 1))))
-
- (cond ((string-equal extra-string "")
- base)
- ((string-equal base "")
- extra-string)
- ((eq uniquify-buffer-name-style 'forward)
- (concat extra-string base))
- ((eq uniquify-buffer-name-style 'reverse)
- (concat base (uniquify-reverse-components extra-string)))
- ((eq uniquify-buffer-name-style 'post-forward)
- (concat base (or uniquify-separator "|") extra-string))
- ((eq uniquify-buffer-name-style 'post-forward-angle-brackets)
- (concat base "<" extra-string ">"))
- (t (error "Bad value for uniquify-buffer-name-style: %s"
- uniquify-buffer-name-style)))))
+ (while (and (> n 0) filename
+ (setq filename (file-name-directory filename))
+ (setq filename (directory-file-name filename)))
+ (let ((file (file-name-nondirectory filename)))
+ (setq n (1- n))
+ (push (if (zerop (length file)) ;nil or "".
+ (prog1 "" (setq filename nil)) ;Could be `filename' iso "".
+ file)
+ extra-string)))
+ (when (zerop n)
+ (if (and filename extra-string
+ (setq filename (file-name-directory filename))
+ (equal filename
+ (file-name-directory (directory-file-name filename))))
+ ;; We're just before the root. Let's add the leading / already.
+ ;; With "/a/b"+"/c/d/b" this leads to "/a/b" and "d/b" but with
+ ;; "/a/b"+"/c/a/b" this leads to "/a/b" and "a/b".
+ (push "" extra-string))
+ (setq uniquify-possibly-resolvable t))
+
+ (cond
+ ((null extra-string) base)
+ ((string-equal base "") ;Happens for dired buffers on the root directory.
+ (mapconcat 'identity extra-string "/"))
+ ((eq uniquify-buffer-name-style 'reverse)
+ (mapconcat 'identity
+ (cons base (nreverse extra-string))
+ (or uniquify-separator "\\")))
+ ((eq uniquify-buffer-name-style 'forward)
+ (mapconcat 'identity (nconc extra-string (list base))
+ "/"))
+ ((eq uniquify-buffer-name-style 'post-forward)
+ (concat base (or uniquify-separator "|")
+ (mapconcat 'identity extra-string "/")))
+ ((eq uniquify-buffer-name-style 'post-forward-angle-brackets)
+ (concat base "<" (mapconcat 'identity extra-string "/")
+ ">"))
+ (t (error "Bad value for uniquify-buffer-name-style: %s"
+ uniquify-buffer-name-style)))))
;; Deal with conflicting-sublist, all of whose elements have identical
(defun uniquify-rationalize-conflicting-sublist (conf-list old-name depth)
(when conf-list
(if (or (cdr conf-list)
- (assoc old-name uniquify-non-file-buffer-names))
+ (member old-name uniquify-non-file-buffer-names))
(when uniquify-possibly-resolvable
(setq uniquify-possibly-resolvable nil
depth (1+ depth))
(dolist (item conf-list)
- (uniquify-set-proposed
- item (uniquify-get-proposed-name
- (uniquify-fix-item-base item)
- (uniquify-fix-item-filename item)
- depth)))
+ (uniquify-set-proposed item (uniquify-get-proposed-name
+ (uniquify-ref-base item)
+ (uniquify-ref-filename item)
+ depth)))
(uniquify-rationalize-a-list conf-list depth))
(unless (string= old-name "")
(uniquify-rename-buffer (car conf-list) old-name)))))
(defun uniquify-rename-buffer (item newname)
- (let ((buffer (uniquify-fix-item-buffer item)))
- (if (not (equal newname (buffer-name buffer)))
- (let ((unset (current-buffer))
- ;; avoid hooks on rename-buffer
- (uniquify-buffer-name-style nil))
- (set-buffer buffer)
- (rename-buffer newname)
- (set-buffer unset)))))
-
-(defun uniquify-reverse-components (instring)
- (let ((sofar '())
- (cursor 0)
- (len (length instring))
- (sep (or uniquify-separator "\\")))
- (while (< cursor len)
- (if (= (aref instring cursor) ?/)
- (setq sofar (cons sep sofar)
- cursor (1+ cursor))
- (let ((first-slash (or (string-match "/" instring cursor) len)))
- (setq sofar (cons (substring instring cursor first-slash) sofar)
- cursor first-slash))))
- (apply (function concat) sofar)))
-
+ (let ((buffer (uniquify-ref-buffer item)))
+ (unless (equal newname (buffer-name buffer))
+ (let ((unset (current-buffer))
+ ;; avoid hooks on rename-buffer
+ (uniquify-buffer-name-style nil))
+ (set-buffer buffer)
+ (rename-buffer newname)
+ (set-buffer unset)))))
;;; Hooks from the rest of Emacs
;; generate-new-buffer, which is called only by Lisp functions
;; create-file-buffer and rename-uniquely. Rename-uniquely generally
;; isn't used for buffers visiting files, so it's sufficient to hook
-;; rename-buffer and create-file-buffer. (Setting find-file-hooks isn't
+;; rename-buffer and create-file-buffer. (Setting find-file-hook isn't
;; sufficient.)
(defadvice rename-buffer (after rename-buffer-uniquify activate)
;; (This ought to set some global variables so the work is done only for
;; buffers with names similar to the deleted buffer. -MDE)
-(defun delay-uniquify-rationalize-file-buffer-names ()
+(defun uniquify-delay-rationalize-file-buffer-names ()
"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
- 'delayed-uniquify-rationalize-file-buffer-names)))
+ 'uniquify-delayed-rationalize-file-buffer-names)))
-(defun delayed-uniquify-rationalize-file-buffer-names ()
+(defun uniquify-delayed-rationalize-file-buffer-names ()
"Rerationalize buffer names and remove self from `post-command-hook'.
See also `delay-rationalize-file-buffer-names' for hook setter."
(uniquify-rationalize-file-buffer-names)
(remove-hook 'post-command-hook
- 'delayed-uniquify-rationalize-file-buffer-names))
+ 'uniquify-delayed-rationalize-file-buffer-names))
-(add-hook 'kill-buffer-hook 'delay-uniquify-rationalize-file-buffer-names)
+(add-hook 'kill-buffer-hook 'uniquify-delay-rationalize-file-buffer-names)
;;; uniquify.el ends here