annotate lisp/uniquify.el @ 18275:e3b0443b4bbb

Fix previous change.
author Richard M. Stallman <rms@gnu.org>
date Tue, 17 Jun 1997 02:29:54 +0000
parents f967f12c8ec8
children b547822f0a11
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
1 ;;; uniquify.el --- unique buffer names dependent on file name
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2
17145
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
3 ;; Copyright (c) 1989, 1995, 1996, 1997 Free Software Foundation, Inc.
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
5 ;; Author: Dick King <king@reasoning.com>
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
6 ;; Maintainer: Michael Ernst <mernst@theory.lcs.mit.edu>
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
7 ;; Created: 15 May 86
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
8
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
10
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
14 ;; any later version.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
15
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
20
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14056
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14056
diff changeset
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14056
diff changeset
24 ;; Boston, MA 02111-1307, USA.
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
25
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
26 ;;; Commentary:
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
27
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
28 ;; Emacs's standard method for making buffer names unique adds <2>, <3>,
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
29 ;; etc. to the end of (all but one of) the buffers. This file replaces
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
30 ;; that behavior, for buffers visiting files and dired buffers, with a
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
31 ;; uniquification that adds parts of the file name until the buffer names
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
32 ;; are unique. For instance, buffers visiting /u/mernst/tmp/Makefile and
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
33 ;; /usr/projects/zaphod/Makefile would be named Makefile|tmp and
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
34 ;; Makefile|zaphod, respectively (instead of Makefile and Makefile<2>).
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
35 ;; Other buffer name styles are also available.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
36
17145
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
37 ;; To use this file, just load it; or add (require 'uniquify) to your .emacs.
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
38 ;; To disable it after loading, set variable uniquify-buffer-name-style to nil.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
39 ;; For other options, see "User-visible variables", below.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
40
13851
922f62608a55 (uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents: 13814
diff changeset
41 ;; A version of uniquify.el that works under Emacs 18, Emacs 19, XEmacs,
922f62608a55 (uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents: 13814
diff changeset
42 ;; and InfoDock is available from the maintainer.
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
43
17145
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
44 ;; Doesn't correctly handle buffer names created by M-x write-file in Emacs 18.
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
45 ;; Doesn't work under NT when backslash is used as a path separator (forward
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
46 ;; slash path separator works fine). To fix, check system-type against
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
47 ;; 'windows-nt, write a routine that breaks paths down into components.
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
48 ;; (Surprisingly, there isn't one built in.)
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
49
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
50 ;;; Change Log:
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
51
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
52 ;; Originally by Dick King <king@reasoning.com> 15 May 86
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
53 ;; Converted for Emacs 18 by Stephen Gildea <gildea@lcs.mit.edu>
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
54 ;; Make uniquify-min-dir-content 0 truly non-invasive. gildea 23 May 89
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
55 ;; Some cleanup. uniquify-min-dir-content default 0. gildea 01 Jun 89
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
56 ;; Don't rename to "". Michael Ernst <mernst@theory.lcs.mit.edu> 15 Jun 94
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
57 ;; Add kill-buffer-hook. Kenneth Manheimer <ken.manheimer@nist.gov> 09 May 95
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
58 ;; Add advice for rename-buffer and create-file-buffer, handle dired buffers,
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
59 ;; kill-buffer-rationalize-buffer-names-p, documentation. mernst 24 May 95
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
60 ;; Remove free variables, fix typos. mernst 5 Jun 95
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
61 ;; Efficiently support Emacs 19.27 & earlier. ken.manheimer, mernst 10 Jun 95
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
62 ;; Rename user options to "uniquify-...", add uniquify-reverse-dir-content-p,
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
63 ;; add uniquify-ask-about-buffer-names-p. king, mernst 13 Jun 95
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
64 ;; Prefix functions by "uniquify-..."; rename mnemonic-buffer-names to
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
65 ;; uniquify-buffer-name-style; add 'forward and 'post-forward-angle-brackets
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
66 ;; styles; remove uniquify-reverse-dir-content-p; add
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
67 ;; uniquify-trailing-separator-p. mernst 4 Aug 95
17145
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
68 ;; Don't call expand-file-name on nil. mernst 7 Jan 96
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
69 ;; Check whether list-buffers-directory is bound. mernst 11 Oct 96
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
70 ;; Ignore non-file non-dired buffers. Colin Rafferty <craffert@ml.com> 3 Mar 97
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
71
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
72 ;; Valuable feedback was provided by
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
73 ;; Paul Smith <psmith@baynetworks.com>,
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
74 ;; Alastair Burt <burt@dfki.uni-kl.de>,
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
75 ;; Bob Weiner <weiner@footloose.sps.mot.com>,
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
76 ;; Albert L. Ting <alt@vlibs.com>,
17145
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
77 ;; gyro@reasoning.com,
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
78 ;; Bryan O'Sullivan <bos@eng.sun.com>.
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
79
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
80
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
81 ;;; Code:
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
82
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
83 (provide 'uniquify)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
84
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
85 ;;; User-visible variables
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
86
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
87 (defgroup uniquify nil
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
88 "Unique buffer names dependent on file name"
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
89 :group 'applications)
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
90
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
91
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
92 (defcustom uniquify-buffer-name-style 'post-forward
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
93 "*If non-nil, buffer names are uniquified with parts of directory name.
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
94 The value determines the buffer name style and is one of `forward',
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
95 `reverse', `post-forward' (the default), or `post-forward-angle-brackets'.
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
96 For example, files `/foo/bar/mumble/name' and `/baz/quux/mumble/name'
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
97 would have the following buffer names in the various styles:
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
98 forward bar/mumble/name quux/mumble/name
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
99 reverse name\\mumble\\bar name\\mumble\\quux
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
100 post-forward name|bar/mumble name|quux/mumble
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
101 post-forward-angle-brackets name<bar/mumble> name<quux/mumble>
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
102 nil name name<2>"
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
103 :type '(radio (const forward)
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
104 (const reverse)
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
105 (const post-forward)
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
106 (const podt-forward-angle-brackets)
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
107 (const nil))
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
108 :group 'uniquify)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
109
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
110 (defcustom uniquify-after-kill-buffer-p nil
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
111 "*If non-nil, rerationalize buffer names after a buffer has been killed.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
112 This can be dangerous if Emacs Lisp code is keeping track of buffers by their
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
113 names (rather than keeping pointers to the buffers themselves)."
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
114 :type 'boolean
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
115 :group 'uniquify)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
116
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
117 (defcustom uniquify-ask-about-buffer-names-p nil
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
118 "*If non-nil, permit user to choose names for buffers with same base file.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
119 If the user chooses to name a buffer, uniquification is preempted and no
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
120 other buffer names are changed."
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
121 :type 'boolean
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
122 :group 'uniquify)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
123
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
124 (defcustom uniquify-min-dir-content 0
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
125 "*Minimum parts of directory name included in buffer name."
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
126 :type 'integer
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
127 :group 'uniquify)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
128
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
129 (defcustom uniquify-separator nil
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
130 "*String separator for buffer name components.
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
131 When `uniquify-buffer-name-style' is `post-forward', separates
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
132 base file name from directory part in buffer names (default \"|\").
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
133 When `uniquify-buffer-name-style' is `reverse', separates all
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
134 file name components (default \"\\\")."
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
135 :type '(choice (const nil) string)
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
136 :group 'uniquify)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
137
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
138 (defcustom uniquify-trailing-separator-p nil
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
139 "*If non-nil, add a file name separator to dired buffer names.
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
140 If `uniquify-buffer-name-style' is `forward', add the separator at the end;
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
141 if it is `reverse', add the separator at the beginning; otherwise, this
17414
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
142 variable is ignored."
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
143 :type 'boolean
f967f12c8ec8 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17145
diff changeset
144 :group 'uniquify)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
145
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
146
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
147 ;;; Utilities
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
148
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
149 (defmacro uniquify-push (item list)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
150 (` (setq (, list) (cons (, item) (, list)))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
151
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
152 (defmacro uniquify-fix-list-base (a)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
153 (` (car (, a))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
154
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
155 (defmacro uniquify-fix-list-filename (a)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
156 (` (car (cdr (, a)))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
157
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
158 (defmacro uniquify-fix-list-buffer (a)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
159 (` (car (cdr (cdr (, a))))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
160
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
161 (defmacro uniquify-cadddr (a)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
162 (` (car (cdr (cdr (cdr (, a)))))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
163
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
164 ;; Internal variables used free
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
165 (defvar uniquify-non-file-buffer-names nil)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
166 (defvar uniquify-possibly-resolvable nil)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
167
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
168 ;;; Main entry point.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
169
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
170 (defun uniquify-rationalize-file-buffer-names (&optional newbuffile newbuf)
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
171 "Makes file buffer names unique by adding segments from file name.
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
172 If `uniquify-min-dir-content' > 0, always pulls that many
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
173 file name elements. Arguments cause only a subset of buffers to be renamed."
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
174 (interactive)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
175 (let (fix-list
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
176 uniquify-non-file-buffer-names
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
177 (depth uniquify-min-dir-content))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
178 (let ((buffers (buffer-list)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
179 (while buffers
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
180 (let* ((buffer (car buffers))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
181 (bfn (if (eq buffer newbuf)
14056
41802d268ffb (uniquify-rationalize-file-buffer-names): If
Karl Heuer <kwzh@gnu.org>
parents: 13851
diff changeset
182 (and newbuffile
41802d268ffb (uniquify-rationalize-file-buffer-names): If
Karl Heuer <kwzh@gnu.org>
parents: 13851
diff changeset
183 (expand-file-name newbuffile))
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
184 (uniquify-buffer-file-name buffer)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
185 (rawname (and bfn (file-name-nondirectory bfn)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
186 (deserving (and rawname
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
187 (or (not newbuffile)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
188 (equal rawname
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
189 (file-name-nondirectory newbuffile))))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
190 (if deserving
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
191 (uniquify-push (list rawname bfn buffer nil) fix-list)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
192 (uniquify-push (list (buffer-name buffer))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
193 uniquify-non-file-buffer-names)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
194 (setq buffers (cdr buffers))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
195 ;; selects buffers whose names may need changing, and others that
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
196 ;; may conflict.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
197 (setq fix-list
13851
922f62608a55 (uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents: 13814
diff changeset
198 (sort fix-list 'uniquify-fix-list-filename-lessp))
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
199 ;; bringing conflicting names together
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
200 (uniquify-rationalize-a-list fix-list depth)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
201 (mapcar 'uniquify-unrationalized-buffer fix-list)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
202
13851
922f62608a55 (uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents: 13814
diff changeset
203 ;; uniquify's version of buffer-file-name
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
204 (defun uniquify-buffer-file-name (buffer)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
205 "Return name of file BUFFER is visiting, or nil if none.
17145
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
206 Works on dired buffers as well as ordinary file-visiting buffers,
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
207 but no others."
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
208 (or (buffer-file-name buffer)
17145
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
209 (and (featurep 'dired)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
210 (save-excursion
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
211 (set-buffer buffer)
17145
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
212 (and
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
213 (eq major-mode 'dired-mode) ; do nothing if not a dired buffer
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
214 (if (boundp 'list-buffers-directory) ; XEmacs mightn't define this
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
215 list-buffers-directory
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
216 ;; don't use default-directory if dired-directory is nil
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
217 (and dired-directory
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
218 (expand-file-name
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
219 (directory-file-name
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
220 (if (consp dired-directory)
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
221 (car dired-directory)
d342009009c7 (uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents: 14295
diff changeset
222 dired-directory))))))))))
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
223
13851
922f62608a55 (uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents: 13814
diff changeset
224 (defun uniquify-fix-list-filename-lessp (fixlist1 fixlist2)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
225 (uniquify-filename-lessp
13851
922f62608a55 (uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents: 13814
diff changeset
226 (uniquify-fix-list-filename fixlist1) (uniquify-fix-list-filename fixlist2)))
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
227
13851
922f62608a55 (uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents: 13814
diff changeset
228 ;; This examines the filename components in reverse order.
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
229 (defun uniquify-filename-lessp (s1 s2)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
230 (let ((s1f (file-name-nondirectory s1))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
231 (s2f (file-name-nondirectory s2)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
232 (and (not (equal s2f ""))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
233 (or (string-lessp s1f s2f)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
234 (and (equal s1f s2f)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
235 (let ((s1d (file-name-directory s1))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
236 (s2d (file-name-directory s2)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
237 (and (not (<= (length s2d) 1))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
238 (or (<= (length s1d) 1)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
239 (uniquify-filename-lessp
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
240 (substring s1d 0 -1)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
241 (substring s2d 0 -1))))))))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
242
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
243 ;; Was named do-the-buffers-you-couldnt-rationalize
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
244 (defun uniquify-unrationalized-buffer (item)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
245 (or (uniquify-cadddr item) nil)) ;maybe better in the future
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
246
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
247 (defun uniquify-rationalize-a-list (fix-list depth)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
248 (let (conflicting-sublist
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
249 (old-name "")
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
250 proposed-name uniquify-possibly-resolvable)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
251 (while fix-list
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
252 (let ((item (car fix-list)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
253 (setq proposed-name (uniquify-get-proposed-name item depth))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
254 (if (not (equal proposed-name old-name))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
255 (progn
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
256 (uniquify-rationalize-conflicting-sublist
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
257 conflicting-sublist old-name depth)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
258 (setq conflicting-sublist nil)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
259 (uniquify-push item conflicting-sublist)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
260 (setq old-name proposed-name))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
261 (setq fix-list (cdr fix-list)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
262 (uniquify-rationalize-conflicting-sublist
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
263 conflicting-sublist old-name depth)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
264
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
265 (defun uniquify-get-proposed-name (item depth)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
266 (let (index
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
267 (extra-string "")
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
268 (n depth)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
269 (base (uniquify-fix-list-base item))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
270 (fn (uniquify-fix-list-filename item)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
271 (while (and (> n 0)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
272 (setq index (string-match
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
273 (concat "\\(^\\|/[^/]*\\)/"
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
274 (regexp-quote extra-string)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
275 (regexp-quote base)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
276 "\\'")
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
277 fn)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
278 (setq extra-string (substring fn
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
279 (if (zerop index) 0 (1+ index))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
280 ;; (- (length base)) fails for base = "".
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
281 ;; Equivalently, we could have used
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
282 ;; (apply 'substring ...
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
283 ;; (and (not (string= "" base))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
284 ;; (list (- (length base)))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
285 (- (length fn) (length base)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
286 n (1- n)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
287 (if (zerop n) (setq uniquify-possibly-resolvable t))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
288
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
289
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
290 ;; Distinguish directories by adding extra separator.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
291 (if (and uniquify-trailing-separator-p
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
292 (file-directory-p fn)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
293 (not (string-equal base "")))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
294 (cond ((eq uniquify-buffer-name-style 'forward)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
295 (setq base (concat base "/")))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
296 ((eq uniquify-buffer-name-style 'reverse)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
297 (setq base (concat (or uniquify-separator "\\") base)))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
298
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
299 ;; Trim trailing separator on directory part
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
300 (if (and (not (string-equal extra-string ""))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
301 (or (eq uniquify-buffer-name-style 'post-forward)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
302 (eq uniquify-buffer-name-style 'post-forward-angle-brackets)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
303 (setq extra-string (substring extra-string 0
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
304 (- (length extra-string) 1))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
305
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
306 (cond ((string-equal extra-string "")
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
307 base)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
308 ((string-equal base "")
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
309 extra-string)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
310 ((eq uniquify-buffer-name-style 'forward)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
311 (concat extra-string base))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
312 ((eq uniquify-buffer-name-style 'reverse)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
313 (concat base (uniquify-reverse-components extra-string)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
314 ((eq uniquify-buffer-name-style 'post-forward)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
315 (concat base (or uniquify-separator "|") extra-string))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
316 ((eq uniquify-buffer-name-style 'post-forward-angle-brackets)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
317 (concat base "<" extra-string ">"))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
318 (t (error "Bad value for uniquify-buffer-name-style: %s"
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
319 uniquify-buffer-name-style)))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
320
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
321
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
322 ;; Deal with conflicting-sublist, which is set by uniquify-rationalize-a-list.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
323 ;; This is only called by uniquify-rationalize-a-list.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
324 (defun uniquify-rationalize-conflicting-sublist (conflicting-sublist old-name depth)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
325 (or (null conflicting-sublist)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
326 (and (null (cdr conflicting-sublist))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
327 (not (assoc old-name uniquify-non-file-buffer-names))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
328 (or (and (not (string= old-name ""))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
329 (uniquify-rename-buffer (car conflicting-sublist) old-name))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
330 t))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
331 (if uniquify-possibly-resolvable
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
332 (uniquify-rationalize-a-list conflicting-sublist (1+ depth)))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
333
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
334 (defun uniquify-rename-buffer (item newname)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
335 (let ((buffer (uniquify-fix-list-buffer item)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
336 (if (not (equal newname (buffer-name buffer)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
337 (let ((unset (current-buffer))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
338 ;; avoid hooks on rename-buffer
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
339 (uniquify-buffer-name-style nil))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
340 (set-buffer buffer)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
341 (rename-buffer newname)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
342 (set-buffer unset))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
343 (rplaca (nthcdr 3 item) t))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
344
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
345 (defun uniquify-reverse-components (instring)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
346 (let ((sofar '())
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
347 (cursor 0)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
348 (len (length instring))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
349 (sep (or uniquify-separator "\\")))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
350 (while (< cursor len)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
351 (if (= (aref instring cursor) ?/)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
352 (setq sofar (cons sep sofar)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
353 cursor (1+ cursor))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
354 (let ((first-slash (or (string-match "/" instring cursor) len)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
355 (setq sofar (cons (substring instring cursor first-slash) sofar)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
356 cursor first-slash))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
357 (apply (function concat) sofar)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
358
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
359
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
360 ;;; Hooks from the rest of Emacs
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
361
14295
ca40593f8933 Several doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
362 ;; Emacs 19 (Emacs or XEmacs)
13814
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
363
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
364 ;; The logical place to put all this code is in generate-new-buffer-name.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
365 ;; It's written in C, so we would add a generate-new-buffer-name-function
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
366 ;; which, if non-nil, would be called instead of the C. One problem with
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
367 ;; that is that generate-new-buffer-name takes a potential buffer name as
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
368 ;; its argument -- not other information, such as what file the buffer will
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
369 ;; visit.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
370
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
371 ;; The below solution works because generate-new-buffer-name is called
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
372 ;; only by rename-buffer (which, as of 19.29, is never called from C) and
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
373 ;; generate-new-buffer, which is called only by Lisp functions
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
374 ;; create-file-buffer and rename-uniquely. Rename-uniquely generally
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
375 ;; isn't used for buffers visiting files, so it's sufficient to hook
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
376 ;; rename-buffer and create-file-buffer. (Setting find-file-hooks isn't
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
377 ;; sufficient.)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
378
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
379 (defadvice rename-buffer (after rename-buffer-uniquify activate)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
380 "Uniquify buffer names with parts of directory name."
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
381 (if (and uniquify-buffer-name-style
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
382 ;; UNIQUE argument
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
383 (ad-get-arg 1))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
384 (progn
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
385 (if uniquify-after-kill-buffer-p
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
386 ;; call with no argument; rationalize vs. old name as well as new
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
387 (uniquify-rationalize-file-buffer-names)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
388 ;; call with argument: rationalize vs. new name only
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
389 (uniquify-rationalize-file-buffer-names
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
390 (uniquify-buffer-file-name (current-buffer)) (current-buffer)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
391 (setq ad-return-value (buffer-name (current-buffer))))))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
392
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
393 (defadvice create-file-buffer (after create-file-buffer-uniquify activate)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
394 "Uniquify buffer names with parts of directory name."
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
395 (if uniquify-buffer-name-style
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
396 (uniquify-rationalize-file-buffer-names (ad-get-arg 0) ad-return-value)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
397
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
398 ;; Buffer deletion
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
399 ;; Rerationalize after a buffer is killed, to reduce coinciding buffer names.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
400 ;; This mechanism uses `kill-buffer-hook', which runs *before* deletion.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
401 ;; That means that the kill-buffer-hook function cannot just delete the
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
402 ;; buffer -- it has to set something to do the rationalization *later*.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
403 ;; It actually puts another function on `post-command-hook'. This other
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
404 ;; function runs the rationalization and then removes itself from the hook.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
405 ;; Is there a better way to accomplish this?
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
406 ;; (This ought to set some global variables so the work is done only for
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
407 ;; buffers with names similar to the deleted buffer. -MDE)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
408
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
409 (defun delay-uniquify-rationalize-file-buffer-names ()
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
410 "Add `delayed-uniquify-rationalize-file-buffer-names' to `post-command-hook'.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
411 For use on, eg, `kill-buffer-hook', to rationalize *after* buffer deletion."
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
412 (if (and uniquify-buffer-name-style
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
413 uniquify-after-kill-buffer-p)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
414 (add-hook 'post-command-hook
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
415 'delayed-uniquify-rationalize-file-buffer-names)))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
416
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
417 (defun delayed-uniquify-rationalize-file-buffer-names ()
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
418 "Rerationalize buffer names and remove self from `post-command-hook'.
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
419 See also `delay-rationalize-file-buffer-names' for hook setter."
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
420 (uniquify-rationalize-file-buffer-names)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
421 (remove-hook 'post-command-hook
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
422 'delayed-uniquify-rationalize-file-buffer-names))
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
423
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
424 (add-hook 'kill-buffer-hook 'delay-uniquify-rationalize-file-buffer-names)
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
425
f683f93b94e9 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
426 ;;; uniquify.el ends here