1996-01-24 23:32:14 +00:00
|
|
|
|
;;; uniquify.el --- unique buffer names dependent on file name
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2001-09-04 12:54:14 +00:00
|
|
|
|
;; Copyright (c) 1989, 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;; Author: Dick King <king@reasoning.com>
|
2001-03-07 10:19:33 +00:00
|
|
|
|
;; Maintainer: FSF
|
2001-09-04 12:54:14 +00:00
|
|
|
|
;; Keywords: files
|
1995-12-21 18:13:58 +00:00
|
|
|
|
;; Created: 15 May 86
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
|
|
|
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
;; Boston, MA 02111-1307, USA.
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; Emacs's standard method for making buffer names unique adds <2>, <3>,
|
|
|
|
|
;; etc. to the end of (all but one of) the buffers. This file replaces
|
|
|
|
|
;; that behavior, for buffers visiting files and dired buffers, with a
|
1996-01-24 23:32:14 +00:00
|
|
|
|
;; uniquification that adds parts of the file name until the buffer names
|
1995-12-21 18:13:58 +00:00
|
|
|
|
;; are unique. For instance, buffers visiting /u/mernst/tmp/Makefile and
|
|
|
|
|
;; /usr/projects/zaphod/Makefile would be named Makefile|tmp and
|
|
|
|
|
;; Makefile|zaphod, respectively (instead of Makefile and Makefile<2>).
|
|
|
|
|
;; Other buffer name styles are also available.
|
|
|
|
|
|
1997-06-21 23:59:11 +00:00
|
|
|
|
;; To use this file, do (require 'uniquify)
|
|
|
|
|
;; and set uniquify-buffer-name-style to one of its non-nil alternative values.
|
|
|
|
|
|
1995-12-21 18:13:58 +00:00
|
|
|
|
;; For other options, see "User-visible variables", below.
|
|
|
|
|
|
1995-12-25 18:45:37 +00:00
|
|
|
|
;; A version of uniquify.el that works under Emacs 18, Emacs 19, XEmacs,
|
|
|
|
|
;; and InfoDock is available from the maintainer.
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;;; Change Log:
|
|
|
|
|
|
|
|
|
|
;; Originally by Dick King <king@reasoning.com> 15 May 86
|
2001-09-23 17:48:31 +00:00
|
|
|
|
;; Converted for Emacs 18 by Stephen Gildea <gildea@stop.mail-abuse.org>
|
1995-12-21 18:13:58 +00:00
|
|
|
|
;; 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
|
|
|
|
|
;; Add kill-buffer-hook. Kenneth Manheimer <ken.manheimer@nist.gov> 09 May 95
|
|
|
|
|
;; Add advice for rename-buffer and create-file-buffer, handle dired buffers,
|
|
|
|
|
;; kill-buffer-rationalize-buffer-names-p, documentation. mernst 24 May 95
|
|
|
|
|
;; Remove free variables, fix typos. mernst 5 Jun 95
|
|
|
|
|
;; Efficiently support Emacs 19.27 & earlier. ken.manheimer, mernst 10 Jun 95
|
|
|
|
|
;; Rename user options to "uniquify-...", add uniquify-reverse-dir-content-p,
|
|
|
|
|
;; add uniquify-ask-about-buffer-names-p. king, mernst 13 Jun 95
|
|
|
|
|
;; Prefix functions by "uniquify-..."; rename mnemonic-buffer-names to
|
|
|
|
|
;; uniquify-buffer-name-style; add 'forward and 'post-forward-angle-brackets
|
|
|
|
|
;; styles; remove uniquify-reverse-dir-content-p; add
|
|
|
|
|
;; uniquify-trailing-separator-p. mernst 4 Aug 95
|
1997-03-11 22:42:37 +00:00
|
|
|
|
;; Don't call expand-file-name on nil. mernst 7 Jan 96
|
|
|
|
|
;; Check whether list-buffers-directory is bound. mernst 11 Oct 96
|
|
|
|
|
;; Ignore non-file non-dired buffers. Colin Rafferty <craffert@ml.com> 3 Mar 97
|
1997-09-07 06:17:29 +00:00
|
|
|
|
;; Use last component, not "", for file name of directories. mernst 27 Jun 97
|
|
|
|
|
;; Use directory-file-name; code cleanup. mernst 6 Sep 97
|
1998-05-19 05:07:48 +00:00
|
|
|
|
;; Add uniquify-ignore-buffers-re.
|
|
|
|
|
;; Andre Srinivasan <andre@visigenic.com> 9 Sep 97
|
2000-11-21 20:42:39 +00:00
|
|
|
|
;; Add uniquify-list-buffers-directory-modes
|
|
|
|
|
;; Stefan Monnier <monnier@cs.yale.edu> 17 Nov 2000
|
2001-08-02 11:30:25 +00:00
|
|
|
|
;; Algorithm and data structure changed to reduce consing with lots of buffers
|
Overall speedup when using many buffers.
(uniquify-fix-item-base, uniquify-fix-item-filename,
uniquify-fix-item-buffer): Changed defmacro to defalias (cosmetic change).
(uniquify-fix-item-unrationalized-buffer): Deleted: was the fourth
place in the item, but waas never used.
(uniquify-fix-item-min-proposed): New defalias: the fourth place
in the item is now used as cache for the proposed name.
(uniquify-rationalize-file-buffer-names): Move computation made on
newbuffile out of the loop, in the newbuffile-nd local var. Use
dolist (cosmetic change). Compute the proposed name for the most
common case and cache it in the fourth place in the item.
(uniquify-rationalize-file-buffer-names): Used to return a list
of flags indicating renamed buffers, but that return value was
never used.
(uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
the cached proposed name, does much less consing and is quicker.
(uniquify-filename-lessp): Deleted.
(uniquify-rationalize-a-list): Use dolist (cosmetic change). Do
not bind locally the uniquify-possibly-resolvable flag. Use the
cached proposed name if possible.
(uniquify-get-proposed-name): Arguments changed, callers changed.
(uniquify-rationalize-conflicting-sublist): Explicitely reset the
uniquify-possibly-resolvable flag, which is no more bound locally.
(uniquify-rename-buffer): Do not set the unrationalised-buffer
flag, which is replaced by the cached proposed name.
2001-07-24 10:39:09 +00:00
|
|
|
|
;; Francesco Potort<72> <pot@gnu.org> (ideas by rms and monnier) 2001-07-18
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;; Valuable feedback was provided by
|
|
|
|
|
;; Paul Smith <psmith@baynetworks.com>,
|
|
|
|
|
;; Alastair Burt <burt@dfki.uni-kl.de>,
|
|
|
|
|
;; Bob Weiner <weiner@footloose.sps.mot.com>,
|
|
|
|
|
;; Albert L. Ting <alt@vlibs.com>,
|
1997-03-11 22:42:37 +00:00
|
|
|
|
;; gyro@reasoning.com,
|
|
|
|
|
;; Bryan O'Sullivan <bos@eng.sun.com>.
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(provide 'uniquify)
|
2000-02-12 19:48:01 +00:00
|
|
|
|
(eval-when-compile (require 'cl))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;;; User-visible variables
|
|
|
|
|
|
1997-04-12 08:35:41 +00:00
|
|
|
|
(defgroup uniquify nil
|
|
|
|
|
"Unique buffer names dependent on file name"
|
|
|
|
|
:group 'applications)
|
|
|
|
|
|
|
|
|
|
|
1997-06-21 23:59:11 +00:00
|
|
|
|
(defcustom uniquify-buffer-name-style nil
|
1995-12-21 18:13:58 +00:00
|
|
|
|
"*If non-nil, buffer names are uniquified with parts of directory name.
|
1996-01-24 23:32:14 +00:00
|
|
|
|
The value determines the buffer name style and is one of `forward',
|
2001-02-17 13:33:11 +00:00
|
|
|
|
`reverse', `post-forward', or `post-forward-angle-brackets'.
|
1996-01-24 23:32:14 +00:00
|
|
|
|
For example, files `/foo/bar/mumble/name' and `/baz/quux/mumble/name'
|
|
|
|
|
would have the following buffer names in the various styles:
|
1995-12-21 18:13:58 +00:00
|
|
|
|
forward bar/mumble/name quux/mumble/name
|
|
|
|
|
reverse name\\mumble\\bar name\\mumble\\quux
|
|
|
|
|
post-forward name|bar/mumble name|quux/mumble
|
|
|
|
|
post-forward-angle-brackets name<bar/mumble> name<quux/mumble>
|
1997-04-12 08:35:41 +00:00
|
|
|
|
nil name name<2>"
|
|
|
|
|
:type '(radio (const forward)
|
|
|
|
|
(const reverse)
|
|
|
|
|
(const post-forward)
|
1997-07-30 19:29:13 +00:00
|
|
|
|
(const post-forward-angle-brackets)
|
1997-06-21 23:59:11 +00:00
|
|
|
|
(const :tag "standard Emacs behavior (nil)" nil))
|
1997-10-16 00:04:22 +00:00
|
|
|
|
:require 'uniquify
|
1997-04-12 08:35:41 +00:00
|
|
|
|
:group 'uniquify)
|
|
|
|
|
|
|
|
|
|
(defcustom uniquify-after-kill-buffer-p nil
|
1995-12-21 18:13:58 +00:00
|
|
|
|
"*If non-nil, rerationalize buffer names after a buffer has been killed.
|
|
|
|
|
This can be dangerous if Emacs Lisp code is keeping track of buffers by their
|
1997-04-12 08:35:41 +00:00
|
|
|
|
names (rather than keeping pointers to the buffers themselves)."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'uniquify)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
1997-04-12 08:35:41 +00:00
|
|
|
|
(defcustom uniquify-ask-about-buffer-names-p nil
|
1995-12-21 18:13:58 +00:00
|
|
|
|
"*If non-nil, permit user to choose names for buffers with same base file.
|
|
|
|
|
If the user chooses to name a buffer, uniquification is preempted and no
|
1997-04-12 08:35:41 +00:00
|
|
|
|
other buffer names are changed."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'uniquify)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
1998-05-19 05:07:48 +00:00
|
|
|
|
(defcustom uniquify-ignore-buffers-re nil
|
1998-07-24 20:13:08 +00:00
|
|
|
|
"*Regular expression matching buffer names that should not be uniquified.
|
1998-05-19 05:07:48 +00:00
|
|
|
|
For instance, set this to \"^draft-[0-9]+$\" to avoid having uniquify rename
|
|
|
|
|
draft buffers even if `uniquify-after-kill-buffer-p' is non-nil and the
|
|
|
|
|
visited file name isn't the same as that of the buffer."
|
1998-07-24 20:13:08 +00:00
|
|
|
|
:type '(choice (const :tag "Uniquify all buffers" nil) regexp)
|
1998-05-19 05:07:48 +00:00
|
|
|
|
:group 'uniquify)
|
|
|
|
|
|
1997-04-12 08:35:41 +00:00
|
|
|
|
(defcustom uniquify-min-dir-content 0
|
1997-09-09 07:08:58 +00:00
|
|
|
|
"*Minimum number of directory name components included in buffer name."
|
1997-04-12 08:35:41 +00:00
|
|
|
|
:type 'integer
|
|
|
|
|
:group 'uniquify)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
1997-04-12 08:35:41 +00:00
|
|
|
|
(defcustom uniquify-separator nil
|
1995-12-21 18:13:58 +00:00
|
|
|
|
"*String separator for buffer name components.
|
1996-01-24 23:32:14 +00:00
|
|
|
|
When `uniquify-buffer-name-style' is `post-forward', separates
|
1995-12-21 18:13:58 +00:00
|
|
|
|
base file name from directory part in buffer names (default \"|\").
|
1996-01-24 23:32:14 +00:00
|
|
|
|
When `uniquify-buffer-name-style' is `reverse', separates all
|
1997-04-12 08:35:41 +00:00
|
|
|
|
file name components (default \"\\\")."
|
|
|
|
|
:type '(choice (const nil) string)
|
|
|
|
|
:group 'uniquify)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
1997-04-12 08:35:41 +00:00
|
|
|
|
(defcustom uniquify-trailing-separator-p nil
|
1996-01-24 23:32:14 +00:00
|
|
|
|
"*If non-nil, add a file name separator to dired buffer names.
|
|
|
|
|
If `uniquify-buffer-name-style' is `forward', add the separator at the end;
|
|
|
|
|
if it is `reverse', add the separator at the beginning; otherwise, this
|
1997-04-12 08:35:41 +00:00
|
|
|
|
variable is ignored."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'uniquify)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2000-11-21 20:42:39 +00:00
|
|
|
|
(defvar uniquify-list-buffers-directory-modes '(dired-mode cvs-mode)
|
|
|
|
|
"List of modes for which uniquify should obey `list-buffers-directory'.
|
|
|
|
|
That means that when `buffer-file-name' is set to nil, `list-buffers-directory'
|
|
|
|
|
contains the name of the directory which the buffer is visiting.")
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;;; Utilities
|
|
|
|
|
|
1997-09-07 06:17:29 +00:00
|
|
|
|
;; For directories, return the last component, not the empty string.
|
|
|
|
|
(defun uniquify-file-name-nondirectory (file-name)
|
|
|
|
|
(file-name-nondirectory (directory-file-name file-name)))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
1997-09-07 06:17:29 +00:00
|
|
|
|
;; uniquify-fix-list data structure
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(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))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;; Internal variables used free
|
|
|
|
|
(defvar uniquify-non-file-buffer-names nil)
|
|
|
|
|
(defvar uniquify-possibly-resolvable nil)
|
|
|
|
|
|
|
|
|
|
;;; Main entry point.
|
|
|
|
|
|
|
|
|
|
(defun uniquify-rationalize-file-buffer-names (&optional newbuffile newbuf)
|
2000-11-21 20:42:39 +00:00
|
|
|
|
"Make file buffer names unique by adding segments from file name.
|
1995-12-21 18:13:58 +00:00
|
|
|
|
If `uniquify-min-dir-content' > 0, always pulls that many
|
1996-01-24 23:32:14 +00:00
|
|
|
|
file name elements. Arguments cause only a subset of buffers to be renamed."
|
1995-12-21 18:13:58 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
(let (fix-list
|
Overall speedup when using many buffers.
(uniquify-fix-item-base, uniquify-fix-item-filename,
uniquify-fix-item-buffer): Changed defmacro to defalias (cosmetic change).
(uniquify-fix-item-unrationalized-buffer): Deleted: was the fourth
place in the item, but waas never used.
(uniquify-fix-item-min-proposed): New defalias: the fourth place
in the item is now used as cache for the proposed name.
(uniquify-rationalize-file-buffer-names): Move computation made on
newbuffile out of the loop, in the newbuffile-nd local var. Use
dolist (cosmetic change). Compute the proposed name for the most
common case and cache it in the fourth place in the item.
(uniquify-rationalize-file-buffer-names): Used to return a list
of flags indicating renamed buffers, but that return value was
never used.
(uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
the cached proposed name, does much less consing and is quicker.
(uniquify-filename-lessp): Deleted.
(uniquify-rationalize-a-list): Use dolist (cosmetic change). Do
not bind locally the uniquify-possibly-resolvable flag. Use the
cached proposed name if possible.
(uniquify-get-proposed-name): Arguments changed, callers changed.
(uniquify-rationalize-conflicting-sublist): Explicitely reset the
uniquify-possibly-resolvable flag, which is no more bound locally.
(uniquify-rename-buffer): Do not set the unrationalised-buffer
flag, which is replaced by the cached proposed name.
2001-07-24 10:39:09 +00:00
|
|
|
|
uniquify-non-file-buffer-names
|
|
|
|
|
(newbuffile-nd (and newbuffile
|
|
|
|
|
(uniquify-file-name-nondirectory newbuffile))))
|
|
|
|
|
(dolist (buffer (buffer-list))
|
2001-08-01 14:39:56 +00:00
|
|
|
|
(let ((bufname (buffer-name buffer))
|
2001-08-01 19:07:33 +00:00
|
|
|
|
bfn rawname proposed)
|
|
|
|
|
(if (and (not (and uniquify-ignore-buffers-re
|
2001-08-01 14:39:56 +00:00
|
|
|
|
(string-match uniquify-ignore-buffers-re
|
|
|
|
|
bufname)))
|
|
|
|
|
(setq bfn (if (eq buffer newbuf)
|
|
|
|
|
(when newbuffile
|
|
|
|
|
(expand-file-name
|
2002-05-19 02:11:24 +00:00
|
|
|
|
(directory-file-name newbuffile)))
|
2001-08-01 14:39:56 +00:00
|
|
|
|
(uniquify-buffer-file-name buffer)))
|
|
|
|
|
(setq rawname (uniquify-file-name-nondirectory bfn))
|
|
|
|
|
(or (not newbuffile)
|
|
|
|
|
(equal rawname newbuffile-nd))
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(setq proposed (uniquify-get-proposed-name
|
|
|
|
|
rawname bfn uniquify-min-dir-content)))
|
2001-08-02 11:40:26 +00:00
|
|
|
|
(push (vector rawname bfn buffer proposed) fix-list)
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(push bufname uniquify-non-file-buffer-names))))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
;; selects buffers whose names may need changing, and others that
|
2001-08-01 19:07:33 +00:00
|
|
|
|
;; may conflict, then bring conflicting names together
|
Overall speedup when using many buffers.
(uniquify-fix-item-base, uniquify-fix-item-filename,
uniquify-fix-item-buffer): Changed defmacro to defalias (cosmetic change).
(uniquify-fix-item-unrationalized-buffer): Deleted: was the fourth
place in the item, but waas never used.
(uniquify-fix-item-min-proposed): New defalias: the fourth place
in the item is now used as cache for the proposed name.
(uniquify-rationalize-file-buffer-names): Move computation made on
newbuffile out of the loop, in the newbuffile-nd local var. Use
dolist (cosmetic change). Compute the proposed name for the most
common case and cache it in the fourth place in the item.
(uniquify-rationalize-file-buffer-names): Used to return a list
of flags indicating renamed buffers, but that return value was
never used.
(uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
the cached proposed name, does much less consing and is quicker.
(uniquify-filename-lessp): Deleted.
(uniquify-rationalize-a-list): Use dolist (cosmetic change). Do
not bind locally the uniquify-possibly-resolvable flag. Use the
cached proposed name if possible.
(uniquify-get-proposed-name): Arguments changed, callers changed.
(uniquify-rationalize-conflicting-sublist): Explicitely reset the
uniquify-possibly-resolvable flag, which is no more bound locally.
(uniquify-rename-buffer): Do not set the unrationalised-buffer
flag, which is replaced by the cached proposed name.
2001-07-24 10:39:09 +00:00
|
|
|
|
(uniquify-rationalize-a-list fix-list uniquify-min-dir-content)))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
1997-09-07 06:17:29 +00:00
|
|
|
|
;; uniquify's version of buffer-file-name; result never contains trailing slash
|
1995-12-21 18:13:58 +00:00
|
|
|
|
(defun uniquify-buffer-file-name (buffer)
|
|
|
|
|
"Return name of file BUFFER is visiting, or nil if none.
|
2000-11-21 20:42:39 +00:00
|
|
|
|
Works on ordinary file-visiting buffers and buffers whose mode is mentioned
|
|
|
|
|
in `uniquify-list-buffers-directory-modes', otherwise returns nil."
|
1995-12-21 18:13:58 +00:00
|
|
|
|
(or (buffer-file-name buffer)
|
2000-11-21 20:42:39 +00:00
|
|
|
|
(with-current-buffer buffer
|
1997-09-09 07:08:58 +00:00
|
|
|
|
(and
|
2000-11-21 20:42:39 +00:00
|
|
|
|
(memq major-mode uniquify-list-buffers-directory-modes)
|
1997-09-09 07:08:58 +00:00
|
|
|
|
(if (boundp 'list-buffers-directory) ; XEmacs mightn't define this
|
|
|
|
|
(and list-buffers-directory
|
|
|
|
|
(directory-file-name list-buffers-directory))
|
|
|
|
|
;; don't use default-directory if dired-directory is nil
|
|
|
|
|
(and dired-directory
|
|
|
|
|
(expand-file-name
|
|
|
|
|
(directory-file-name
|
|
|
|
|
(if (consp dired-directory)
|
|
|
|
|
(car dired-directory)
|
2000-11-21 20:42:39 +00:00
|
|
|
|
dired-directory)))))))))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(defun uniquify-item-greaterp (item1 item2)
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(string-lessp (uniquify-ref-proposed item2)
|
|
|
|
|
(uniquify-ref-proposed item1)))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
(defun uniquify-rationalize-a-list (fix-list depth)
|
1997-09-09 07:08:58 +00:00
|
|
|
|
(let (conflicting-sublist ; all elements have the same proposed name
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(old-proposed "")
|
|
|
|
|
proposed)
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(dolist (item (sort fix-list 'uniquify-item-greaterp))
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(setq proposed (uniquify-ref-proposed item))
|
|
|
|
|
(unless (equal proposed old-proposed)
|
Overall speedup when using many buffers.
(uniquify-fix-item-base, uniquify-fix-item-filename,
uniquify-fix-item-buffer): Changed defmacro to defalias (cosmetic change).
(uniquify-fix-item-unrationalized-buffer): Deleted: was the fourth
place in the item, but waas never used.
(uniquify-fix-item-min-proposed): New defalias: the fourth place
in the item is now used as cache for the proposed name.
(uniquify-rationalize-file-buffer-names): Move computation made on
newbuffile out of the loop, in the newbuffile-nd local var. Use
dolist (cosmetic change). Compute the proposed name for the most
common case and cache it in the fourth place in the item.
(uniquify-rationalize-file-buffer-names): Used to return a list
of flags indicating renamed buffers, but that return value was
never used.
(uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
the cached proposed name, does much less consing and is quicker.
(uniquify-filename-lessp): Deleted.
(uniquify-rationalize-a-list): Use dolist (cosmetic change). Do
not bind locally the uniquify-possibly-resolvable flag. Use the
cached proposed name if possible.
(uniquify-get-proposed-name): Arguments changed, callers changed.
(uniquify-rationalize-conflicting-sublist): Explicitely reset the
uniquify-possibly-resolvable flag, which is no more bound locally.
(uniquify-rename-buffer): Do not set the unrationalised-buffer
flag, which is replaced by the cached proposed name.
2001-07-24 10:39:09 +00:00
|
|
|
|
(uniquify-rationalize-conflicting-sublist conflicting-sublist
|
2001-08-02 11:30:25 +00:00
|
|
|
|
old-proposed depth)
|
Overall speedup when using many buffers.
(uniquify-fix-item-base, uniquify-fix-item-filename,
uniquify-fix-item-buffer): Changed defmacro to defalias (cosmetic change).
(uniquify-fix-item-unrationalized-buffer): Deleted: was the fourth
place in the item, but waas never used.
(uniquify-fix-item-min-proposed): New defalias: the fourth place
in the item is now used as cache for the proposed name.
(uniquify-rationalize-file-buffer-names): Move computation made on
newbuffile out of the loop, in the newbuffile-nd local var. Use
dolist (cosmetic change). Compute the proposed name for the most
common case and cache it in the fourth place in the item.
(uniquify-rationalize-file-buffer-names): Used to return a list
of flags indicating renamed buffers, but that return value was
never used.
(uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
the cached proposed name, does much less consing and is quicker.
(uniquify-filename-lessp): Deleted.
(uniquify-rationalize-a-list): Use dolist (cosmetic change). Do
not bind locally the uniquify-possibly-resolvable flag. Use the
cached proposed name if possible.
(uniquify-get-proposed-name): Arguments changed, callers changed.
(uniquify-rationalize-conflicting-sublist): Explicitely reset the
uniquify-possibly-resolvable flag, which is no more bound locally.
(uniquify-rename-buffer): Do not set the unrationalised-buffer
flag, which is replaced by the cached proposed name.
2001-07-24 10:39:09 +00:00
|
|
|
|
(setq conflicting-sublist nil))
|
|
|
|
|
(push item conflicting-sublist)
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(setq old-proposed proposed))
|
|
|
|
|
(uniquify-rationalize-conflicting-sublist conflicting-sublist
|
|
|
|
|
old-proposed depth)))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
Overall speedup when using many buffers.
(uniquify-fix-item-base, uniquify-fix-item-filename,
uniquify-fix-item-buffer): Changed defmacro to defalias (cosmetic change).
(uniquify-fix-item-unrationalized-buffer): Deleted: was the fourth
place in the item, but waas never used.
(uniquify-fix-item-min-proposed): New defalias: the fourth place
in the item is now used as cache for the proposed name.
(uniquify-rationalize-file-buffer-names): Move computation made on
newbuffile out of the loop, in the newbuffile-nd local var. Use
dolist (cosmetic change). Compute the proposed name for the most
common case and cache it in the fourth place in the item.
(uniquify-rationalize-file-buffer-names): Used to return a list
of flags indicating renamed buffers, but that return value was
never used.
(uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
the cached proposed name, does much less consing and is quicker.
(uniquify-filename-lessp): Deleted.
(uniquify-rationalize-a-list): Use dolist (cosmetic change). Do
not bind locally the uniquify-possibly-resolvable flag. Use the
cached proposed name if possible.
(uniquify-get-proposed-name): Arguments changed, callers changed.
(uniquify-rationalize-conflicting-sublist): Explicitely reset the
uniquify-possibly-resolvable flag, which is no more bound locally.
(uniquify-rename-buffer): Do not set the unrationalised-buffer
flag, which is replaced by the cached proposed name.
2001-07-24 10:39:09 +00:00
|
|
|
|
(defun uniquify-get-proposed-name (base filename depth)
|
2001-10-05 09:27:29 +00:00
|
|
|
|
(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)
|
Overall speedup when using many buffers.
(uniquify-fix-item-base, uniquify-fix-item-filename,
uniquify-fix-item-buffer): Changed defmacro to defalias (cosmetic change).
(uniquify-fix-item-unrationalized-buffer): Deleted: was the fourth
place in the item, but waas never used.
(uniquify-fix-item-min-proposed): New defalias: the fourth place
in the item is now used as cache for the proposed name.
(uniquify-rationalize-file-buffer-names): Move computation made on
newbuffile out of the loop, in the newbuffile-nd local var. Use
dolist (cosmetic change). Compute the proposed name for the most
common case and cache it in the fourth place in the item.
(uniquify-rationalize-file-buffer-names): Used to return a list
of flags indicating renamed buffers, but that return value was
never used.
(uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
the cached proposed name, does much less consing and is quicker.
(uniquify-filename-lessp): Deleted.
(uniquify-rationalize-a-list): Use dolist (cosmetic change). Do
not bind locally the uniquify-possibly-resolvable flag. Use the
cached proposed name if possible.
(uniquify-get-proposed-name): Arguments changed, callers changed.
(uniquify-rationalize-conflicting-sublist): Explicitely reset the
uniquify-possibly-resolvable flag, which is no more bound locally.
(uniquify-rename-buffer): Do not set the unrationalised-buffer
flag, which is replaced by the cached proposed name.
2001-07-24 10:39:09 +00:00
|
|
|
|
(n depth))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
(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)
|
2001-10-23 22:01:17 +00:00
|
|
|
|
(if (and filename extra-string
|
2001-10-05 09:27:29 +00:00
|
|
|
|
(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 (string directory-sep-char)))
|
|
|
|
|
((eq uniquify-buffer-name-style 'reverse)
|
|
|
|
|
(let ((dirsep (string directory-sep-char)))
|
|
|
|
|
(mapconcat 'identity
|
|
|
|
|
(cons base (nreverse extra-string))
|
|
|
|
|
(or uniquify-separator "\\"))))
|
|
|
|
|
((eq uniquify-buffer-name-style 'forward)
|
|
|
|
|
(mapconcat 'identity (nconc extra-string (list base))
|
|
|
|
|
(string directory-sep-char)))
|
|
|
|
|
((eq uniquify-buffer-name-style 'post-forward)
|
|
|
|
|
(concat base (or uniquify-separator "|")
|
|
|
|
|
(mapconcat 'identity extra-string (string directory-sep-char))))
|
|
|
|
|
((eq uniquify-buffer-name-style 'post-forward-angle-brackets)
|
|
|
|
|
(concat base "<" (mapconcat 'identity extra-string
|
|
|
|
|
(string directory-sep-char)) ">"))
|
|
|
|
|
(t (error "Bad value for uniquify-buffer-name-style: %s"
|
|
|
|
|
uniquify-buffer-name-style)))))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
|
1997-09-07 06:17:29 +00:00
|
|
|
|
;; Deal with conflicting-sublist, all of whose elements have identical
|
|
|
|
|
;; "base" components.
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(defun uniquify-rationalize-conflicting-sublist (conf-list old-name depth)
|
|
|
|
|
(when conf-list
|
|
|
|
|
(if (or (cdr conf-list)
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(member old-name uniquify-non-file-buffer-names))
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(when uniquify-possibly-resolvable
|
|
|
|
|
(setq uniquify-possibly-resolvable nil
|
|
|
|
|
depth (1+ depth))
|
|
|
|
|
(dolist (item conf-list)
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(uniquify-set-proposed item (uniquify-get-proposed-name
|
|
|
|
|
(uniquify-ref-base item)
|
|
|
|
|
(uniquify-ref-filename item)
|
|
|
|
|
depth)))
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(uniquify-rationalize-a-list conf-list depth))
|
|
|
|
|
(unless (string= old-name "")
|
|
|
|
|
(uniquify-rename-buffer (car conf-list) old-name)))))
|
|
|
|
|
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
(defun uniquify-rename-buffer (item newname)
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(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)))))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;;; Hooks from the rest of Emacs
|
|
|
|
|
|
|
|
|
|
;; The logical place to put all this code is in generate-new-buffer-name.
|
|
|
|
|
;; It's written in C, so we would add a generate-new-buffer-name-function
|
|
|
|
|
;; which, if non-nil, would be called instead of the C. One problem with
|
|
|
|
|
;; that is that generate-new-buffer-name takes a potential buffer name as
|
|
|
|
|
;; its argument -- not other information, such as what file the buffer will
|
|
|
|
|
;; visit.
|
|
|
|
|
|
|
|
|
|
;; The below solution works because generate-new-buffer-name is called
|
|
|
|
|
;; only by rename-buffer (which, as of 19.29, is never called from C) and
|
|
|
|
|
;; 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
|
|
|
|
|
;; sufficient.)
|
|
|
|
|
|
|
|
|
|
(defadvice rename-buffer (after rename-buffer-uniquify activate)
|
|
|
|
|
"Uniquify buffer names with parts of directory name."
|
|
|
|
|
(if (and uniquify-buffer-name-style
|
|
|
|
|
;; UNIQUE argument
|
|
|
|
|
(ad-get-arg 1))
|
|
|
|
|
(progn
|
|
|
|
|
(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
|
|
|
|
|
(uniquify-rationalize-file-buffer-names
|
|
|
|
|
(uniquify-buffer-file-name (current-buffer)) (current-buffer)))
|
|
|
|
|
(setq ad-return-value (buffer-name (current-buffer))))))
|
|
|
|
|
|
|
|
|
|
(defadvice create-file-buffer (after create-file-buffer-uniquify activate)
|
|
|
|
|
"Uniquify buffer names with parts of directory name."
|
|
|
|
|
(if uniquify-buffer-name-style
|
|
|
|
|
(uniquify-rationalize-file-buffer-names (ad-get-arg 0) ad-return-value)))
|
|
|
|
|
|
|
|
|
|
;; Buffer deletion
|
|
|
|
|
;; Rerationalize after a buffer is killed, to reduce coinciding buffer names.
|
|
|
|
|
;; This mechanism uses `kill-buffer-hook', which runs *before* deletion.
|
|
|
|
|
;; That means that the kill-buffer-hook function cannot just delete the
|
|
|
|
|
;; buffer -- it has to set something to do the rationalization *later*.
|
|
|
|
|
;; It actually puts another function on `post-command-hook'. This other
|
|
|
|
|
;; function runs the rationalization and then removes itself from the hook.
|
|
|
|
|
;; Is there a better way to accomplish this?
|
|
|
|
|
;; (This ought to set some global variables so the work is done only for
|
|
|
|
|
;; buffers with names similar to the deleted buffer. -MDE)
|
|
|
|
|
|
2002-06-27 15:35:48 +00:00
|
|
|
|
(defun uniquify-delay-rationalize-file-buffer-names ()
|
1995-12-21 18:13:58 +00:00
|
|
|
|
"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
|
2002-06-27 15:35:48 +00:00
|
|
|
|
uniquify-after-kill-buffer-p
|
|
|
|
|
;; Rationalizing is costly, so don't do it for temp buffers.
|
|
|
|
|
(uniquify-buffer-file-name (current-buffer)))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
(add-hook 'post-command-hook
|
2002-06-27 15:35:48 +00:00
|
|
|
|
'uniquify-delayed-rationalize-file-buffer-names)))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2002-06-27 15:35:48 +00:00
|
|
|
|
(defun uniquify-delayed-rationalize-file-buffer-names ()
|
1995-12-21 18:13:58 +00:00
|
|
|
|
"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
|
2002-06-27 15:35:48 +00:00
|
|
|
|
'uniquify-delayed-rationalize-file-buffer-names))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2002-06-27 15:35:48 +00:00
|
|
|
|
(add-hook 'kill-buffer-hook 'uniquify-delay-rationalize-file-buffer-names)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;;; uniquify.el ends here
|