Mercurial > emacs
annotate lisp/uniquify.el @ 50842:b64d29a02737
(ad-make-advised-docstring): Adjust usage for new help-add-fundoc-usage.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 06 May 2003 13:58:30 +0000 |
parents | 1fe62a68c56a |
children | 86903fed9f75 |
rev | line source |
---|---|
14295 | 1 ;;; uniquify.el --- unique buffer names dependent on file name |
13814 | 2 |
39117 | 3 ;; Copyright (c) 1989, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. |
13814 | 4 |
5 ;; Author: Dick King <king@reasoning.com> | |
36621 | 6 ;; Maintainer: FSF |
39117 | 7 ;; Keywords: files |
13814 | 8 ;; Created: 15 May 86 |
9 | |
10 ;; This file is part of GNU Emacs. | |
11 | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
13814 | 26 |
27 ;;; Commentary: | |
28 | |
29 ;; Emacs's standard method for making buffer names unique adds <2>, <3>, | |
30 ;; etc. to the end of (all but one of) the buffers. This file replaces | |
31 ;; that behavior, for buffers visiting files and dired buffers, with a | |
14295 | 32 ;; uniquification that adds parts of the file name until the buffer names |
13814 | 33 ;; are unique. For instance, buffers visiting /u/mernst/tmp/Makefile and |
34 ;; /usr/projects/zaphod/Makefile would be named Makefile|tmp and | |
35 ;; Makefile|zaphod, respectively (instead of Makefile and Makefile<2>). | |
36 ;; Other buffer name styles are also available. | |
37 | |
18375
b547822f0a11
(delay-uniquify-rationalize-file-buffer-names): Remove this hook here,
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
38 ;; To use this file, do (require 'uniquify) |
b547822f0a11
(delay-uniquify-rationalize-file-buffer-names): Remove this hook here,
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
39 ;; and set uniquify-buffer-name-style to one of its non-nil alternative values. |
b547822f0a11
(delay-uniquify-rationalize-file-buffer-names): Remove this hook here,
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
40 |
13814 | 41 ;; For other options, see "User-visible variables", below. |
42 | |
13851
922f62608a55
(uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents:
13814
diff
changeset
|
43 ;; 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
|
44 ;; and InfoDock is available from the maintainer. |
13814 | 45 |
46 ;;; Change Log: | |
47 | |
48 ;; Originally by Dick King <king@reasoning.com> 15 May 86 | |
39400
e69aa66ec7cc
Update Stephen Gildea's mail address.
Eli Zaretskii <eliz@gnu.org>
parents:
39117
diff
changeset
|
49 ;; Converted for Emacs 18 by Stephen Gildea <gildea@stop.mail-abuse.org> |
13814 | 50 ;; Make uniquify-min-dir-content 0 truly non-invasive. gildea 23 May 89 |
51 ;; Some cleanup. uniquify-min-dir-content default 0. gildea 01 Jun 89 | |
52 ;; Don't rename to "". Michael Ernst <mernst@theory.lcs.mit.edu> 15 Jun 94 | |
53 ;; Add kill-buffer-hook. Kenneth Manheimer <ken.manheimer@nist.gov> 09 May 95 | |
54 ;; Add advice for rename-buffer and create-file-buffer, handle dired buffers, | |
55 ;; kill-buffer-rationalize-buffer-names-p, documentation. mernst 24 May 95 | |
56 ;; Remove free variables, fix typos. mernst 5 Jun 95 | |
57 ;; Efficiently support Emacs 19.27 & earlier. ken.manheimer, mernst 10 Jun 95 | |
58 ;; Rename user options to "uniquify-...", add uniquify-reverse-dir-content-p, | |
59 ;; add uniquify-ask-about-buffer-names-p. king, mernst 13 Jun 95 | |
60 ;; Prefix functions by "uniquify-..."; rename mnemonic-buffer-names to | |
61 ;; uniquify-buffer-name-style; add 'forward and 'post-forward-angle-brackets | |
62 ;; styles; remove uniquify-reverse-dir-content-p; add | |
63 ;; 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
|
64 ;; 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
|
65 ;; 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
|
66 ;; Ignore non-file non-dired buffers. Colin Rafferty <craffert@ml.com> 3 Mar 97 |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
67 ;; Use last component, not "", for file name of directories. mernst 27 Jun 97 |
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
68 ;; Use directory-file-name; code cleanup. mernst 6 Sep 97 |
22140
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
69 ;; Add uniquify-ignore-buffers-re. |
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
70 ;; Andre Srinivasan <andre@visigenic.com> 9 Sep 97 |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
71 ;; Add uniquify-list-buffers-directory-modes |
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
72 ;; Stefan Monnier <monnier@cs.yale.edu> 17 Nov 2000 |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
73 ;; Algorithm and data structure changed to reduce consing with lots of buffers |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
74 ;; Francesco Potort́ <pot@gnu.org> (ideas by rms and monnier) 2001-07-18 |
13814 | 75 |
76 ;; Valuable feedback was provided by | |
77 ;; Paul Smith <psmith@baynetworks.com>, | |
78 ;; Alastair Burt <burt@dfki.uni-kl.de>, | |
79 ;; Bob Weiner <weiner@footloose.sps.mot.com>, | |
80 ;; Albert L. Ting <alt@vlibs.com>, | |
17145
d342009009c7
(uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents:
14295
diff
changeset
|
81 ;; gyro@reasoning.com, |
d342009009c7
(uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents:
14295
diff
changeset
|
82 ;; Bryan O'Sullivan <bos@eng.sun.com>. |
13814 | 83 |
84 | |
85 ;;; Code: | |
86 | |
27686
888000b8e8b6
(toplevel): Require CL at compile time.
Gerd Moellmann <gerd@gnu.org>
parents:
26444
diff
changeset
|
87 (eval-when-compile (require 'cl)) |
13814 | 88 |
89 ;;; User-visible variables | |
90 | |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
91 (defgroup uniquify nil |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
92 "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
|
93 :group 'applications) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
94 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
95 |
18375
b547822f0a11
(delay-uniquify-rationalize-file-buffer-names): Remove this hook here,
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
96 (defcustom uniquify-buffer-name-style nil |
13814 | 97 "*If non-nil, buffer names are uniquified with parts of directory name. |
14295 | 98 The value determines the buffer name style and is one of `forward', |
36141
02c61ff8a12b
(uniquify-buffer-name-style): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
33700
diff
changeset
|
99 `reverse', `post-forward', or `post-forward-angle-brackets'. |
14295 | 100 For example, files `/foo/bar/mumble/name' and `/baz/quux/mumble/name' |
101 would have the following buffer names in the various styles: | |
13814 | 102 forward bar/mumble/name quux/mumble/name |
103 reverse name\\mumble\\bar name\\mumble\\quux | |
104 post-forward name|bar/mumble name|quux/mumble | |
105 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
|
106 nil name name<2>" |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
107 :type '(radio (const forward) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
108 (const reverse) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
109 (const post-forward) |
19044
192305191a1f
(uniquify-buffer-name-style): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
18876
diff
changeset
|
110 (const post-forward-angle-brackets) |
18375
b547822f0a11
(delay-uniquify-rationalize-file-buffer-names): Remove this hook here,
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
111 (const :tag "standard Emacs behavior (nil)" nil)) |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
112 :require 'uniquify) |
13814 | 113 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
114 (defcustom uniquify-after-kill-buffer-p nil |
13814 | 115 "*If non-nil, rerationalize buffer names after a buffer has been killed. |
116 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
|
117 names (rather than keeping pointers to the buffers themselves)." |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
118 :type 'boolean) |
13814 | 119 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
120 (defcustom uniquify-ask-about-buffer-names-p nil |
13814 | 121 "*If non-nil, permit user to choose names for buffers with same base file. |
122 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
|
123 other buffer names are changed." |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
124 :type 'boolean) |
13814 | 125 |
50785
2fb36b4b42f5
(uniquify-ignore-buffers-re): Change default to match some Gnus buffers.
Richard M. Stallman <rms@gnu.org>
parents:
48833
diff
changeset
|
126 ;; The default value matches certain Gnus buffers. |
2fb36b4b42f5
(uniquify-ignore-buffers-re): Change default to match some Gnus buffers.
Richard M. Stallman <rms@gnu.org>
parents:
48833
diff
changeset
|
127 (defcustom uniquify-ignore-buffers-re "^\\*\\(un\\)?sent " |
22808
435144eea4f4
(uniquify-ignore-buffers-re): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
22140
diff
changeset
|
128 "*Regular expression matching buffer names that should not be uniquified. |
22140
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
129 For instance, set this to \"^draft-[0-9]+$\" to avoid having uniquify rename |
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
130 draft buffers even if `uniquify-after-kill-buffer-p' is non-nil and the |
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
131 visited file name isn't the same as that of the buffer." |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
132 :type '(choice (const :tag "Uniquify all buffers" nil) regexp)) |
22140
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
133 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
134 (defcustom uniquify-min-dir-content 0 |
19840
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
135 "*Minimum number of directory name components included in buffer name." |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
136 :type 'integer) |
13814 | 137 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
138 (defcustom uniquify-separator nil |
13814 | 139 "*String separator for buffer name components. |
14295 | 140 When `uniquify-buffer-name-style' is `post-forward', separates |
13814 | 141 base file name from directory part in buffer names (default \"|\"). |
14295 | 142 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
|
143 file name components (default \"\\\")." |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
144 :type '(choice (const nil) string)) |
13814 | 145 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
146 (defcustom uniquify-trailing-separator-p nil |
14295 | 147 "*If non-nil, add a file name separator to dired buffer names. |
148 If `uniquify-buffer-name-style' is `forward', add the separator at the end; | |
149 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
|
150 variable is ignored." |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
151 :type 'boolean) |
13814 | 152 |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
153 (defvar uniquify-list-buffers-directory-modes '(dired-mode cvs-mode) |
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
154 "List of modes for which uniquify should obey `list-buffers-directory'. |
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
155 That means that when `buffer-file-name' is set to nil, `list-buffers-directory' |
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
156 contains the name of the directory which the buffer is visiting.") |
13814 | 157 |
158 ;;; Utilities | |
159 | |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
160 ;; uniquify-fix-list data structure |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
161 (defstruct (uniquify-item |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
162 (:constructor nil) (:copier nil) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
163 (:constructor uniquify-make-item (base filename buffer proposed))) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
164 base filename buffer proposed) |
13814 | 165 |
166 ;; Internal variables used free | |
167 (defvar uniquify-possibly-resolvable nil) | |
168 | |
169 ;;; Main entry point. | |
170 | |
171 (defun uniquify-rationalize-file-buffer-names (&optional newbuffile newbuf) | |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
172 "Make file buffer names unique by adding segments from file name. |
13814 | 173 If `uniquify-min-dir-content' > 0, always pulls that many |
47644
de6f2422c09f
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
174 file name elements. |
de6f2422c09f
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
175 Arguments NEWBUFFILE and NEWBUF cause only a subset of buffers to be renamed." |
13814 | 176 (interactive) |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
177 (when newbuffile |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
178 (setq newbuffile (expand-file-name (directory-file-name newbuffile)))) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
179 (let ((fix-list nil) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
180 (base (and newbuffile (file-name-nondirectory newbuffile)))) |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
181 (dolist (buffer (buffer-list)) |
38641
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
182 (let ((bufname (buffer-name buffer)) |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
183 bfn rawname) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
184 (when (and (not (and uniquify-ignore-buffers-re |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
185 (string-match uniquify-ignore-buffers-re |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
186 bufname))) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
187 (setq bfn (if (eq buffer newbuf) newbuffile |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
188 (uniquify-buffer-file-name buffer))) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
189 (setq rawname (file-name-nondirectory bfn)) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
190 (or (null base) (equal rawname base))) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
191 (when (setq bfn (file-name-directory bfn)) ;Strip off the `base'. |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
192 (setq bfn (directory-file-name bfn))) ;Strip trailing slash. |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
193 (push (uniquify-make-item rawname bfn buffer |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
194 (uniquify-get-proposed-name rawname bfn)) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
195 fix-list)))) |
13814 | 196 ;; selects buffers whose names may need changing, and others that |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
197 ;; may conflict, then bring conflicting names together |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
198 (uniquify-rationalize-a-list fix-list))) |
13814 | 199 |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
200 ;; uniquify's version of buffer-file-name; result never contains trailing slash |
13814 | 201 (defun uniquify-buffer-file-name (buffer) |
202 "Return name of file BUFFER is visiting, or nil if none. | |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
203 Works on ordinary file-visiting buffers and buffers whose mode is mentioned |
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
204 in `uniquify-list-buffers-directory-modes', otherwise returns nil." |
13814 | 205 (or (buffer-file-name buffer) |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
206 (with-current-buffer buffer |
19840
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
207 (and |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
208 (memq major-mode uniquify-list-buffers-directory-modes) |
19840
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
209 (if (boundp 'list-buffers-directory) ; XEmacs mightn't define this |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
210 (and list-buffers-directory |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
211 (directory-file-name list-buffers-directory)) |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
212 ;; don't use default-directory if dired-directory is nil |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
213 (and dired-directory |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
214 (expand-file-name |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
215 (directory-file-name |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
216 (if (consp dired-directory) |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
217 (car dired-directory) |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
218 dired-directory))))))))) |
13814 | 219 |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
220 (defun uniquify-item-greaterp (item1 item2) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
221 (string-lessp (uniquify-item-proposed item2) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
222 (uniquify-item-proposed item1))) |
13814 | 223 |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
224 (defun uniquify-rationalize-a-list (fix-list &optional depth) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
225 (unless depth (setq depth uniquify-min-dir-content)) |
19840
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
226 (let (conflicting-sublist ; all elements have the same proposed name |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
227 (old-proposed "") |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
228 proposed) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
229 ;; Divide fix-list into items with same proposed names and pass them |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
230 ;; to uniquify-rationalize-conflicting-sublist. |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
231 (dolist (item (sort fix-list 'uniquify-item-greaterp)) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
232 (setq proposed (uniquify-item-proposed item)) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
233 (unless (equal proposed old-proposed) |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
234 (uniquify-rationalize-conflicting-sublist conflicting-sublist |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
235 old-proposed depth) |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
236 (setq conflicting-sublist nil)) |
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
237 (push item conflicting-sublist) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
238 (setq old-proposed proposed)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
239 (uniquify-rationalize-conflicting-sublist conflicting-sublist |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
240 old-proposed depth))) |
13814 | 241 |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
242 (defun uniquify-get-proposed-name (base filename &optional depth) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
243 (unless depth (setq depth uniquify-min-dir-content)) |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
244 (assert (equal (directory-file-name filename) filename)) ;No trailing slash. |
13814 | 245 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
246 ;; Distinguish directories by adding extra separator. |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
247 (if (and uniquify-trailing-separator-p |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
248 (file-directory-p (expand-file-name base filename)) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
249 (not (string-equal base ""))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
250 (cond ((eq uniquify-buffer-name-style 'forward) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
251 (setq base (file-name-as-directory base))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
252 ;; (setq base (concat base "/"))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
253 ((eq uniquify-buffer-name-style 'reverse) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
254 (setq base (concat (or uniquify-separator "\\") base))))) |
13814 | 255 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
256 (let ((extra-string nil) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
257 (n depth)) |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
258 (while (and (> n 0) filename) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
259 (let ((file (file-name-nondirectory filename))) |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
260 (when (setq filename (file-name-directory filename)) |
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
261 (setq filename (directory-file-name filename))) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
262 (setq n (1- n)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
263 (push (if (zerop (length file)) ;nil or "". |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
264 (prog1 "" (setq filename nil)) ;Could be `filename' iso "". |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
265 file) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
266 extra-string))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
267 (when (zerop n) |
40229
618f0d7df7a0
(uniquify-get-proposed-name): Fix (.. "usr" "/usr" 0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39559
diff
changeset
|
268 (if (and filename extra-string |
50826
1fe62a68c56a
(uniquify-buffer-name-style, uniquify-after-kill-buffer-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50814
diff
changeset
|
269 (equal filename (file-name-directory filename))) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
270 ;; We're just before the root. Let's add the leading / already. |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
271 ;; With "/a/b"+"/c/d/b" this leads to "/a/b" and "d/b" but with |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
272 ;; "/a/b"+"/c/a/b" this leads to "/a/b" and "a/b". |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
273 (push "" extra-string)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
274 (setq uniquify-possibly-resolvable t)) |
13814 | 275 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
276 (cond |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
277 ((null extra-string) base) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
278 ((string-equal base "") ;Happens for dired buffers on the root directory. |
47863
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
279 (mapconcat 'identity extra-string "/")) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
280 ((eq uniquify-buffer-name-style 'reverse) |
47863
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
281 (mapconcat 'identity |
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
282 (cons base (nreverse extra-string)) |
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
283 (or uniquify-separator "\\"))) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
284 ((eq uniquify-buffer-name-style 'forward) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
285 (mapconcat 'identity (nconc extra-string (list base)) |
47863
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
286 "/")) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
287 ((eq uniquify-buffer-name-style 'post-forward) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
288 (concat base (or uniquify-separator "|") |
47863
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
289 (mapconcat 'identity extra-string "/"))) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
290 ((eq uniquify-buffer-name-style 'post-forward-angle-brackets) |
47863
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
291 (concat base "<" (mapconcat 'identity extra-string "/") |
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
292 ">")) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
293 (t (error "Bad value for uniquify-buffer-name-style: %s" |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
294 uniquify-buffer-name-style))))) |
13814 | 295 |
296 | |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
297 ;; Deal with conflicting-sublist, all of whose elements have identical |
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
298 ;; "base" components. |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
299 (defun uniquify-rationalize-conflicting-sublist (conf-list old-name depth) |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
300 (when conf-list |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
301 (if (or (cdr conf-list) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
302 ;; Check that the proposed name doesn't conflict with some |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
303 ;; existing buffer. |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
304 (let ((buf (get-buffer old-name))) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
305 (and buf (not (eq buf (uniquify-item-buffer (car conf-list))))))) |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
306 (when uniquify-possibly-resolvable |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
307 (setq uniquify-possibly-resolvable nil |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
308 depth (1+ depth)) |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
309 (dolist (item conf-list) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
310 (setf (uniquify-item-proposed item) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
311 (uniquify-get-proposed-name |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
312 (uniquify-item-base item) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
313 (uniquify-item-filename item) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
314 depth))) |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
315 (uniquify-rationalize-a-list conf-list depth)) |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
316 (unless (string= old-name "") |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
317 (uniquify-rename-buffer (car conf-list) old-name))))) |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
318 |
13814 | 319 |
320 (defun uniquify-rename-buffer (item newname) | |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
321 (let ((buffer (uniquify-item-buffer item))) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
322 (unless (equal newname (buffer-name buffer)) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
323 (with-current-buffer buffer |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
324 (let ((uniquify-buffer-name-style nil)) ;Avoid hooks on rename-buffer. |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
325 ;; Pass the `unique' arg, just in case. |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
326 (rename-buffer newname t)))))) |
13814 | 327 |
328 ;;; Hooks from the rest of Emacs | |
329 | |
330 ;; The logical place to put all this code is in generate-new-buffer-name. | |
331 ;; It's written in C, so we would add a generate-new-buffer-name-function | |
332 ;; which, if non-nil, would be called instead of the C. One problem with | |
333 ;; that is that generate-new-buffer-name takes a potential buffer name as | |
334 ;; its argument -- not other information, such as what file the buffer will | |
335 ;; visit. | |
336 | |
337 ;; The below solution works because generate-new-buffer-name is called | |
338 ;; only by rename-buffer (which, as of 19.29, is never called from C) and | |
339 ;; generate-new-buffer, which is called only by Lisp functions | |
340 ;; create-file-buffer and rename-uniquely. Rename-uniquely generally | |
341 ;; isn't used for buffers visiting files, so it's sufficient to hook | |
46899
f00337f04e78
Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46047
diff
changeset
|
342 ;; rename-buffer and create-file-buffer. (Setting find-file-hook isn't |
13814 | 343 ;; sufficient.) |
344 | |
345 (defadvice rename-buffer (after rename-buffer-uniquify activate) | |
346 "Uniquify buffer names with parts of directory name." | |
347 (if (and uniquify-buffer-name-style | |
348 ;; UNIQUE argument | |
349 (ad-get-arg 1)) | |
350 (progn | |
48833
df00563bf991
(uniquify-rationalize-file-buffer-names, rename-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47863
diff
changeset
|
351 (if uniquify-after-kill-buffer-p |
13814 | 352 ;; call with no argument; rationalize vs. old name as well as new |
353 (uniquify-rationalize-file-buffer-names) | |
354 ;; call with argument: rationalize vs. new name only | |
355 (uniquify-rationalize-file-buffer-names | |
356 (uniquify-buffer-file-name (current-buffer)) (current-buffer))) | |
357 (setq ad-return-value (buffer-name (current-buffer)))))) | |
358 | |
359 (defadvice create-file-buffer (after create-file-buffer-uniquify activate) | |
360 "Uniquify buffer names with parts of directory name." | |
361 (if uniquify-buffer-name-style | |
362 (uniquify-rationalize-file-buffer-names (ad-get-arg 0) ad-return-value))) | |
363 | |
364 ;; Buffer deletion | |
365 ;; Rerationalize after a buffer is killed, to reduce coinciding buffer names. | |
366 ;; This mechanism uses `kill-buffer-hook', which runs *before* deletion. | |
367 ;; That means that the kill-buffer-hook function cannot just delete the | |
368 ;; buffer -- it has to set something to do the rationalization *later*. | |
369 ;; It actually puts another function on `post-command-hook'. This other | |
370 ;; function runs the rationalization and then removes itself from the hook. | |
371 ;; Is there a better way to accomplish this? | |
372 ;; (This ought to set some global variables so the work is done only for | |
373 ;; buffers with names similar to the deleted buffer. -MDE) | |
374 | |
46047
24044f416cc3
(uniquify-delay-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45358
diff
changeset
|
375 (defun uniquify-delay-rationalize-file-buffer-names () |
13814 | 376 "Add `delayed-uniquify-rationalize-file-buffer-names' to `post-command-hook'. |
377 For use on, eg, `kill-buffer-hook', to rationalize *after* buffer deletion." | |
378 (if (and uniquify-buffer-name-style | |
48833
df00563bf991
(uniquify-rationalize-file-buffer-names, rename-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47863
diff
changeset
|
379 uniquify-after-kill-buffer-p |
df00563bf991
(uniquify-rationalize-file-buffer-names, rename-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47863
diff
changeset
|
380 ;; Rationalizing is costly, so don't do it for temp buffers. |
df00563bf991
(uniquify-rationalize-file-buffer-names, rename-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47863
diff
changeset
|
381 (uniquify-buffer-file-name (current-buffer))) |
13814 | 382 (add-hook 'post-command-hook |
46047
24044f416cc3
(uniquify-delay-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45358
diff
changeset
|
383 'uniquify-delayed-rationalize-file-buffer-names))) |
13814 | 384 |
46047
24044f416cc3
(uniquify-delay-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45358
diff
changeset
|
385 (defun uniquify-delayed-rationalize-file-buffer-names () |
13814 | 386 "Rerationalize buffer names and remove self from `post-command-hook'. |
387 See also `delay-rationalize-file-buffer-names' for hook setter." | |
388 (uniquify-rationalize-file-buffer-names) | |
389 (remove-hook 'post-command-hook | |
46047
24044f416cc3
(uniquify-delay-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45358
diff
changeset
|
390 'uniquify-delayed-rationalize-file-buffer-names)) |
13814 | 391 |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
392 ;; Ideally we'd like to add it buffer-locally, but that doesn't work |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
393 ;; because kill-buffer-hook is not permanent-local :-( |
48833
df00563bf991
(uniquify-rationalize-file-buffer-names, rename-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47863
diff
changeset
|
394 (add-hook 'kill-buffer-hook 'uniquify-delay-rationalize-file-buffer-names) |
df00563bf991
(uniquify-rationalize-file-buffer-names, rename-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47863
diff
changeset
|
395 |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
396 (provide 'uniquify) |
13814 | 397 ;;; uniquify.el ends here |