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
|
|
|
|
|
2005-01-05 21:20:38 +00:00
|
|
|
|
;; Copyright (c) 1989, 1995, 1996, 1997, 2001, 2003, 2005
|
|
|
|
|
;; 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:
|
|
|
|
|
|
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))
|
2005-05-19 19:06:19 +00:00
|
|
|
|
:require 'uniquify
|
|
|
|
|
:group 'uniquify)
|
1997-04-12 08:35:41 +00:00
|
|
|
|
|
2003-05-13 19:15:19 +00:00
|
|
|
|
(defcustom uniquify-after-kill-buffer-p t
|
2003-05-08 19:39:32 +00:00
|
|
|
|
"If non-nil, rerationalize buffer names after a buffer has been killed."
|
2005-05-19 19:06:19 +00:00
|
|
|
|
: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."
|
2005-05-19 19:06:19 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'uniquify)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2003-05-03 13:51:00 +00:00
|
|
|
|
;; The default value matches certain Gnus buffers.
|
2003-05-13 19:15:19 +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."
|
2005-05-19 19:06:19 +00:00
|
|
|
|
:type '(choice (const :tag "Uniquify all buffers" nil) regexp)
|
|
|
|
|
:group 'uniquify)
|
1998-05-19 05:07:48 +00:00
|
|
|
|
|
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."
|
2005-05-19 19:06:19 +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 \"\\\")."
|
2005-05-19 19:06:19 +00:00
|
|
|
|
: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."
|
2005-05-19 19:06:19 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'uniquify)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2003-05-08 19:39:32 +00:00
|
|
|
|
(defcustom uniquify-strip-common-suffix
|
|
|
|
|
;; Using it when uniquify-min-dir-content>0 doesn't make much sense.
|
|
|
|
|
(eq 0 uniquify-min-dir-content)
|
|
|
|
|
"If non-nil, strip common directory suffixes of conflicting files.
|
|
|
|
|
E.g. if you open /a1/b/c/d and /a2/b/c/d, the buffer names will say
|
|
|
|
|
\"d|a1\" and \"d|a2\" instead of \"d|a1/b/c\" and \"d|a2/b/c\".
|
|
|
|
|
This can be handy when you have deep parallel hierarchies."
|
2005-05-19 19:06:19 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'uniquify)
|
2003-05-08 19:39:32 +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
|
|
|
|
;; uniquify-fix-list data structure
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(defstruct (uniquify-item
|
|
|
|
|
(:constructor nil) (:copier nil)
|
2003-05-08 19:39:32 +00:00
|
|
|
|
(:constructor uniquify-make-item
|
|
|
|
|
(base dirname buffer &optional proposed)))
|
2003-05-07 15:53:08 +00:00
|
|
|
|
base dirname buffer proposed)
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;; Internal variables used free
|
|
|
|
|
(defvar uniquify-possibly-resolvable nil)
|
|
|
|
|
|
2003-05-06 14:29:39 +00:00
|
|
|
|
(defvar uniquify-managed nil
|
2003-05-07 16:03:14 +00:00
|
|
|
|
"Non-nil if the name of this buffer is managed by uniquify.
|
|
|
|
|
It actually holds the list of `uniquify-item's corresponding to the conflict.")
|
2003-05-06 14:29:39 +00:00
|
|
|
|
(make-variable-buffer-local 'uniquify-managed)
|
|
|
|
|
(put 'uniquify-managed 'permanent-local t)
|
|
|
|
|
|
1995-12-21 18:13:58 +00:00
|
|
|
|
;;; Main entry point.
|
|
|
|
|
|
2003-05-09 13:21:05 +00:00
|
|
|
|
(defun uniquify-rationalize-file-buffer-names (base dirname 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
|
2002-09-27 17:37:47 +00:00
|
|
|
|
file name elements.
|
2003-05-10 18:16:19 +00:00
|
|
|
|
Arguments BASE, DIRNAME, and NEWBUF specify the new buffer that causes
|
2005-01-05 21:20:38 +00:00
|
|
|
|
this rationalization."
|
|
|
|
|
(interactive
|
|
|
|
|
(list (if uniquify-managed
|
|
|
|
|
(uniquify-item-base (car uniquify-managed)) (buffer-name))
|
|
|
|
|
(uniquify-buffer-file-name (current-buffer))
|
|
|
|
|
(current-buffer)))
|
2005-01-05 21:49:02 +00:00
|
|
|
|
;; Make sure we don't get confused by outdated uniquify-managed info in
|
|
|
|
|
;; this buffer.
|
|
|
|
|
(with-current-buffer newbuf (setq uniquify-managed nil))
|
|
|
|
|
(when dirname
|
2003-05-09 13:21:05 +00:00
|
|
|
|
(setq dirname (expand-file-name (directory-file-name dirname)))
|
|
|
|
|
(let ((fix-list (list (uniquify-make-item base dirname newbuf)))
|
|
|
|
|
items)
|
2003-05-07 21:56:43 +00:00
|
|
|
|
(dolist (buffer (buffer-list))
|
2003-05-09 13:21:05 +00:00
|
|
|
|
(when (and (not (and uniquify-ignore-buffers-re
|
|
|
|
|
(string-match uniquify-ignore-buffers-re
|
|
|
|
|
(buffer-name buffer))))
|
|
|
|
|
;; Only try to rename buffers we actually manage.
|
|
|
|
|
(setq items (buffer-local-value 'uniquify-managed buffer))
|
|
|
|
|
(equal base (uniquify-item-base (car items)))
|
|
|
|
|
;; Don't re-add stuff we already have. Actually this
|
|
|
|
|
;; whole `and' test should only match at most once.
|
|
|
|
|
(not (memq (car items) fix-list)))
|
2003-05-10 18:16:19 +00:00
|
|
|
|
(unless (cdr items)
|
|
|
|
|
;; If there was no conflict, the buffer-name is equal to the
|
|
|
|
|
;; base-name and we may have missed a rename-buffer because
|
|
|
|
|
;; of code like in set-visited-file-name:
|
|
|
|
|
;; (or (string= new-name (buffer-name)) (rename-buffer new-name t))
|
|
|
|
|
;; So we need to refresh the dirname of the uniquify-item.
|
|
|
|
|
(setf (uniquify-item-dirname (car items))
|
|
|
|
|
(uniquify-buffer-file-name
|
|
|
|
|
(uniquify-item-buffer (car items))))
|
2003-05-13 19:15:19 +00:00
|
|
|
|
;; This shouldn't happen, but maybe there's no dirname any more.
|
2003-05-10 18:16:19 +00:00
|
|
|
|
(unless (uniquify-item-dirname (car items))
|
|
|
|
|
(with-current-buffer (uniquify-item-buffer (car items))
|
2003-05-10 22:46:10 +00:00
|
|
|
|
(setq uniquify-managed nil))
|
|
|
|
|
(setq items nil)))
|
2003-05-09 13:21:05 +00:00
|
|
|
|
(setq fix-list (append fix-list items))))
|
2003-05-07 21:56:43 +00:00
|
|
|
|
;; selects buffers whose names may need changing, and others that
|
|
|
|
|
;; may conflict, then bring conflicting names together
|
|
|
|
|
(uniquify-rationalize fix-list))))
|
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)
|
2003-05-09 13:21:05 +00:00
|
|
|
|
"Return name of directory, 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."
|
2003-05-09 13:21:05 +00:00
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(let ((filename
|
|
|
|
|
(or buffer-file-name
|
|
|
|
|
(if (memq major-mode uniquify-list-buffers-directory-modes)
|
|
|
|
|
list-buffers-directory))))
|
|
|
|
|
(when filename
|
2003-05-10 18:16:19 +00:00
|
|
|
|
(directory-file-name
|
|
|
|
|
(file-name-directory
|
|
|
|
|
(expand-file-name
|
|
|
|
|
(directory-file-name filename))))))))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2003-05-07 16:03:14 +00:00
|
|
|
|
(defun uniquify-rerationalize-w/o-cb (fix-list)
|
|
|
|
|
"Re-rationalize the buffers in FIX-LIST, but ignoring current-buffer."
|
|
|
|
|
(let ((new-fix-list nil))
|
|
|
|
|
(dolist (item fix-list)
|
|
|
|
|
(let ((buf (uniquify-item-buffer item)))
|
|
|
|
|
(unless (or (eq buf (current-buffer)) (not (buffer-live-p buf)))
|
|
|
|
|
(push item new-fix-list))))
|
|
|
|
|
(when new-fix-list
|
|
|
|
|
(uniquify-rationalize new-fix-list))))
|
|
|
|
|
|
|
|
|
|
(defun uniquify-rationalize (fix-list)
|
|
|
|
|
;; Set up uniquify to re-rationalize after killing/renaming
|
|
|
|
|
;; if there is a conflict.
|
2003-05-08 19:39:32 +00:00
|
|
|
|
(dolist (item fix-list)
|
|
|
|
|
(with-current-buffer (uniquify-item-buffer item)
|
2003-05-10 18:16:19 +00:00
|
|
|
|
;; Refresh the dirnames and proposed names.
|
2003-05-08 19:39:32 +00:00
|
|
|
|
(setf (uniquify-item-proposed item)
|
|
|
|
|
(uniquify-get-proposed-name (uniquify-item-base item)
|
|
|
|
|
(uniquify-item-dirname item)))
|
2003-05-07 16:03:14 +00:00
|
|
|
|
(setq uniquify-managed fix-list)))
|
2003-05-08 19:39:32 +00:00
|
|
|
|
;; Strip any shared last directory names of the dirname.
|
|
|
|
|
(when (and (cdr fix-list) uniquify-strip-common-suffix)
|
|
|
|
|
(let ((strip t))
|
|
|
|
|
(while (let* ((base (file-name-nondirectory
|
|
|
|
|
(uniquify-item-dirname (car fix-list))))
|
|
|
|
|
(items fix-list))
|
|
|
|
|
(when (> (length base) 0)
|
|
|
|
|
(while (and strip items)
|
|
|
|
|
(unless (equal base (file-name-nondirectory
|
|
|
|
|
(uniquify-item-dirname (pop items))))
|
|
|
|
|
(setq strip nil)))
|
|
|
|
|
strip))
|
|
|
|
|
;; It's all the same => strip.
|
|
|
|
|
(dolist (item (prog1 fix-list (setq fix-list nil)))
|
|
|
|
|
;; Create new items because the old ones are kept (with the true
|
|
|
|
|
;; `dirname') for later rerationalizing.
|
|
|
|
|
(push (uniquify-make-item (uniquify-item-base item)
|
|
|
|
|
(let ((f (file-name-directory
|
|
|
|
|
(uniquify-item-dirname item))))
|
|
|
|
|
(and f (directory-file-name f)))
|
|
|
|
|
(uniquify-item-buffer item)
|
|
|
|
|
(uniquify-item-proposed item))
|
|
|
|
|
fix-list)))))
|
2003-05-07 16:03:14 +00:00
|
|
|
|
;; If uniquify-min-dir-content is 0, this will end up just
|
|
|
|
|
;; passing fix-list to uniquify-rationalize-conflicting-sublist.
|
|
|
|
|
(uniquify-rationalize-a-list fix-list))
|
|
|
|
|
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(defun uniquify-item-greaterp (item1 item2)
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(string-lessp (uniquify-item-proposed item2)
|
|
|
|
|
(uniquify-item-proposed item1)))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(defun uniquify-rationalize-a-list (fix-list &optional depth)
|
|
|
|
|
(unless depth (setq depth uniquify-min-dir-content))
|
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)
|
2003-05-04 21:30:25 +00:00
|
|
|
|
;; Divide fix-list into items with same proposed names and pass them
|
|
|
|
|
;; to uniquify-rationalize-conflicting-sublist.
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(dolist (item (sort fix-list 'uniquify-item-greaterp))
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(setq proposed (uniquify-item-proposed item))
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(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
|
|
|
|
|
2003-05-07 15:53:08 +00:00
|
|
|
|
(defun uniquify-get-proposed-name (base dirname &optional depth)
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(unless depth (setq depth uniquify-min-dir-content))
|
2003-05-08 19:39:32 +00:00
|
|
|
|
(assert (equal (directory-file-name dirname) dirname)) ;No trailing slash.
|
2001-10-05 09:27:29 +00:00
|
|
|
|
|
|
|
|
|
;; Distinguish directories by adding extra separator.
|
|
|
|
|
(if (and uniquify-trailing-separator-p
|
2003-05-07 15:53:08 +00:00
|
|
|
|
(file-directory-p (expand-file-name base dirname))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
(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))
|
2003-05-07 15:53:08 +00:00
|
|
|
|
(while (and (> n 0) dirname)
|
|
|
|
|
(let ((file (file-name-nondirectory dirname)))
|
|
|
|
|
(when (setq dirname (file-name-directory dirname))
|
|
|
|
|
(setq dirname (directory-file-name dirname)))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
(setq n (1- n))
|
|
|
|
|
(push (if (zerop (length file)) ;nil or "".
|
2003-05-08 19:39:32 +00:00
|
|
|
|
(prog1 "" (setq dirname nil)) ;Could be `dirname' iso "".
|
2001-10-05 09:27:29 +00:00
|
|
|
|
file)
|
|
|
|
|
extra-string)))
|
|
|
|
|
(when (zerop n)
|
2003-05-07 15:53:08 +00:00
|
|
|
|
(if (and dirname extra-string
|
|
|
|
|
(equal dirname (file-name-directory dirname)))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
;; 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.
|
2002-10-14 01:28:36 +00:00
|
|
|
|
(mapconcat 'identity extra-string "/"))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
((eq uniquify-buffer-name-style 'reverse)
|
2002-10-14 01:28:36 +00:00
|
|
|
|
(mapconcat 'identity
|
|
|
|
|
(cons base (nreverse extra-string))
|
|
|
|
|
(or uniquify-separator "\\")))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
((eq uniquify-buffer-name-style 'forward)
|
|
|
|
|
(mapconcat 'identity (nconc extra-string (list base))
|
2002-10-14 01:28:36 +00:00
|
|
|
|
"/"))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
((eq uniquify-buffer-name-style 'post-forward)
|
|
|
|
|
(concat base (or uniquify-separator "|")
|
2002-10-14 01:28:36 +00:00
|
|
|
|
(mapconcat 'identity extra-string "/")))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
((eq uniquify-buffer-name-style 'post-forward-angle-brackets)
|
2002-10-14 01:28:36 +00:00
|
|
|
|
(concat base "<" (mapconcat 'identity extra-string "/")
|
|
|
|
|
">"))
|
2001-10-05 09:27:29 +00:00
|
|
|
|
(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)
|
2003-05-04 21:30:25 +00:00
|
|
|
|
;; Check that the proposed name doesn't conflict with some
|
|
|
|
|
;; existing buffer.
|
|
|
|
|
(let ((buf (get-buffer old-name)))
|
|
|
|
|
(and buf (not (eq buf (uniquify-item-buffer (car conf-list)))))))
|
2001-08-01 19:07:33 +00:00
|
|
|
|
(when uniquify-possibly-resolvable
|
|
|
|
|
(setq uniquify-possibly-resolvable nil
|
|
|
|
|
depth (1+ depth))
|
|
|
|
|
(dolist (item conf-list)
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(setf (uniquify-item-proposed item)
|
|
|
|
|
(uniquify-get-proposed-name
|
|
|
|
|
(uniquify-item-base item)
|
2003-05-07 15:53:08 +00:00
|
|
|
|
(uniquify-item-dirname item)
|
2003-05-04 21:30:25 +00:00
|
|
|
|
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)
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(let ((buffer (uniquify-item-buffer item)))
|
2001-08-02 11:30:25 +00:00
|
|
|
|
(unless (equal newname (buffer-name buffer))
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(let ((uniquify-buffer-name-style nil)) ;Avoid hooks on rename-buffer.
|
2003-05-06 14:29:39 +00:00
|
|
|
|
;; Pass the `unique' arg, so the advice doesn't mark it as unmanaged.
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(rename-buffer newname t))))))
|
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
|
2002-08-15 00:48:20 +00:00
|
|
|
|
;; rename-buffer and create-file-buffer. (Setting find-file-hook isn't
|
1995-12-21 18:13:58 +00:00
|
|
|
|
;; sufficient.)
|
|
|
|
|
|
|
|
|
|
(defadvice rename-buffer (after rename-buffer-uniquify activate)
|
|
|
|
|
"Uniquify buffer names with parts of directory name."
|
2003-05-07 16:03:14 +00:00
|
|
|
|
(uniquify-maybe-rerationalize-w/o-cb)
|
2003-05-06 14:29:39 +00:00
|
|
|
|
(if (null (ad-get-arg 1)) ; no UNIQUE argument.
|
|
|
|
|
;; Mark this buffer so it won't be renamed by uniquify.
|
|
|
|
|
(setq uniquify-managed nil)
|
|
|
|
|
(when uniquify-buffer-name-style
|
2003-05-07 16:03:14 +00:00
|
|
|
|
;; Rerationalize w.r.t the new name.
|
|
|
|
|
(uniquify-rationalize-file-buffer-names
|
2003-05-09 13:21:05 +00:00
|
|
|
|
(ad-get-arg 0)
|
|
|
|
|
(uniquify-buffer-file-name (current-buffer))
|
|
|
|
|
(current-buffer))
|
2003-05-06 14:29:39 +00:00
|
|
|
|
(setq ad-return-value (buffer-name (current-buffer))))))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
(defadvice create-file-buffer (after create-file-buffer-uniquify activate)
|
|
|
|
|
"Uniquify buffer names with parts of directory name."
|
|
|
|
|
(if uniquify-buffer-name-style
|
2003-05-09 13:21:05 +00:00
|
|
|
|
(let ((filename (expand-file-name (directory-file-name (ad-get-arg 0)))))
|
|
|
|
|
(uniquify-rationalize-file-buffer-names
|
|
|
|
|
(file-name-nondirectory filename)
|
|
|
|
|
(file-name-directory filename) ad-return-value))))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
|
|
|
|
;; 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)
|
|
|
|
|
|
2003-05-07 16:03:14 +00:00
|
|
|
|
(defun uniquify-maybe-rerationalize-w/o-cb ()
|
|
|
|
|
"Re-rationalize buffer names, ignoring current buffer.
|
|
|
|
|
For use on `kill-buffer-hook'."
|
|
|
|
|
(if (and (cdr uniquify-managed)
|
2003-05-06 14:29:39 +00:00
|
|
|
|
uniquify-buffer-name-style
|
2003-05-07 16:03:14 +00:00
|
|
|
|
uniquify-after-kill-buffer-p)
|
|
|
|
|
(uniquify-rerationalize-w/o-cb uniquify-managed)))
|
1995-12-21 18:13:58 +00:00
|
|
|
|
|
2003-05-04 21:30:25 +00:00
|
|
|
|
;; Ideally we'd like to add it buffer-locally, but that doesn't work
|
|
|
|
|
;; because kill-buffer-hook is not permanent-local :-(
|
2003-05-07 16:03:14 +00:00
|
|
|
|
(add-hook 'kill-buffer-hook 'uniquify-maybe-rerationalize-w/o-cb)
|
2002-12-13 19:52:35 +00:00
|
|
|
|
|
2003-05-04 21:30:25 +00:00
|
|
|
|
(provide 'uniquify)
|
2003-09-01 15:45:59 +00:00
|
|
|
|
|
2005-01-05 21:20:38 +00:00
|
|
|
|
;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065
|
1995-12-21 18:13:58 +00:00
|
|
|
|
;;; uniquify.el ends here
|