Mercurial > emacs
annotate lisp/uniquify.el @ 44340:93314c938a62
(f90-keywords-re, f90-keywords-level-3-re)
(f90-procedures-re, f90-operators-re, f90-hpf-keywords-re): Use regexp-opt.
(f90-keywords-re, f90-keywords-level-3-re): Add `pure' and `elemental'.
(f90-procedures-re): Add `null' and `cpu_time' from F95.
(f90-font-lock-keywords-1): Minor reorganization so we don't need
`override' any more.
(f90-font-lock-keywords-3): Use `keep' rather than `override'.
(f90-indent-subprogram): Use indent-region.
(f90-break-line): Use indent-according-to-mode.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 02 Apr 2002 17:28:26 +0000 |
parents | 618f0d7df7a0 |
children | f57a87acf8bf |
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 | |
87 (provide 'uniquify) | |
27686
888000b8e8b6
(toplevel): Require CL at compile time.
Gerd Moellmann <gerd@gnu.org>
parents:
26444
diff
changeset
|
88 (eval-when-compile (require 'cl)) |
13814 | 89 |
90 ;;; User-visible variables | |
91 | |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
92 (defgroup uniquify nil |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
93 "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
|
94 :group 'applications) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
95 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
96 |
18375
b547822f0a11
(delay-uniquify-rationalize-file-buffer-names): Remove this hook here,
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
97 (defcustom uniquify-buffer-name-style nil |
13814 | 98 "*If non-nil, buffer names are uniquified with parts of directory name. |
14295 | 99 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
|
100 `reverse', `post-forward', or `post-forward-angle-brackets'. |
14295 | 101 For example, files `/foo/bar/mumble/name' and `/baz/quux/mumble/name' |
102 would have the following buffer names in the various styles: | |
13814 | 103 forward bar/mumble/name quux/mumble/name |
104 reverse name\\mumble\\bar name\\mumble\\quux | |
105 post-forward name|bar/mumble name|quux/mumble | |
106 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
|
107 nil name name<2>" |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
108 :type '(radio (const forward) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
109 (const reverse) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
110 (const post-forward) |
19044
192305191a1f
(uniquify-buffer-name-style): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
18876
diff
changeset
|
111 (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
|
112 (const :tag "standard Emacs behavior (nil)" nil)) |
20065
34f94bc812c3
(uniquify-buffer-name-style): Add :require.
Karl Heuer <kwzh@gnu.org>
parents:
19840
diff
changeset
|
113 :require 'uniquify |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
114 :group 'uniquify) |
13814 | 115 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
116 (defcustom uniquify-after-kill-buffer-p nil |
13814 | 117 "*If non-nil, rerationalize buffer names after a buffer has been killed. |
118 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
|
119 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
|
120 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
121 :group 'uniquify) |
13814 | 122 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
123 (defcustom uniquify-ask-about-buffer-names-p nil |
13814 | 124 "*If non-nil, permit user to choose names for buffers with same base file. |
125 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
|
126 other buffer names are changed." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
127 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
128 :group 'uniquify) |
13814 | 129 |
22140
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
130 (defcustom uniquify-ignore-buffers-re nil |
22808
435144eea4f4
(uniquify-ignore-buffers-re): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
22140
diff
changeset
|
131 "*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
|
132 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
|
133 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
|
134 visited file name isn't the same as that of the buffer." |
22808
435144eea4f4
(uniquify-ignore-buffers-re): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
22140
diff
changeset
|
135 :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
|
136 :group 'uniquify) |
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
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-min-dir-content 0 |
19840
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
139 "*Minimum number of directory name components included in buffer name." |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
140 :type 'integer |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
141 :group 'uniquify) |
13814 | 142 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
143 (defcustom uniquify-separator nil |
13814 | 144 "*String separator for buffer name components. |
14295 | 145 When `uniquify-buffer-name-style' is `post-forward', separates |
13814 | 146 base file name from directory part in buffer names (default \"|\"). |
14295 | 147 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
|
148 file name components (default \"\\\")." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
149 :type '(choice (const nil) string) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
150 :group 'uniquify) |
13814 | 151 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
152 (defcustom uniquify-trailing-separator-p nil |
14295 | 153 "*If non-nil, add a file name separator to dired buffer names. |
154 If `uniquify-buffer-name-style' is `forward', add the separator at the end; | |
155 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
|
156 variable is ignored." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
157 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
158 :group 'uniquify) |
13814 | 159 |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
160 (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
|
161 "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
|
162 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
|
163 contains the name of the directory which the buffer is visiting.") |
13814 | 164 |
165 ;;; Utilities | |
166 | |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
167 ;; For directories, return the last component, not the empty string. |
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
168 (defun uniquify-file-name-nondirectory (file-name) |
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
169 (file-name-nondirectory (directory-file-name file-name))) |
13814 | 170 |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
171 ;; uniquify-fix-list data structure |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
172 (defsubst uniquify-ref-base (x) (aref x 0)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
173 (defsubst uniquify-ref-filename (x) (aref x 1)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
174 (defsubst uniquify-ref-buffer (x) (aref x 2)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
175 (defsubst uniquify-ref-proposed (x) (aref x 3)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
176 (defsubst uniquify-set-proposed (x p) (aset x 3 p)) |
13814 | 177 |
178 ;; Internal variables used free | |
179 (defvar uniquify-non-file-buffer-names nil) | |
180 (defvar uniquify-possibly-resolvable nil) | |
181 | |
182 ;;; Main entry point. | |
183 | |
184 (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
|
185 "Make file buffer names unique by adding segments from file name. |
13814 | 186 If `uniquify-min-dir-content' > 0, always pulls that many |
14295 | 187 file name elements. Arguments cause only a subset of buffers to be renamed." |
13814 | 188 (interactive) |
189 (let (fix-list | |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
190 uniquify-non-file-buffer-names |
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
191 (newbuffile-nd (and newbuffile |
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
192 (uniquify-file-name-nondirectory newbuffile)))) |
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
193 (dolist (buffer (buffer-list)) |
38641
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
194 (let ((bufname (buffer-name buffer)) |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
195 bfn rawname proposed) |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
196 (if (and (not (and uniquify-ignore-buffers-re |
38641
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
197 (string-match uniquify-ignore-buffers-re |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
198 bufname))) |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
199 (setq bfn (if (eq buffer newbuf) |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
200 (when newbuffile |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
201 (expand-file-name |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
202 (if (file-directory-p newbuffile) |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
203 (directory-file-name newbuffile) |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
204 newbuffile))) |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
205 (uniquify-buffer-file-name buffer))) |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
206 (setq rawname (uniquify-file-name-nondirectory bfn)) |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
207 (or (not newbuffile) |
2e6dd0de246f
(uniquify-rationalize-file-buffer-names): Reshuffled the code for
Francesco Potortì <pot@gnu.org>
parents:
38639
diff
changeset
|
208 (equal rawname newbuffile-nd)) |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
209 (setq proposed (uniquify-get-proposed-name |
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
210 rawname bfn uniquify-min-dir-content))) |
38666 | 211 (push (vector rawname bfn buffer proposed) fix-list) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
212 (push bufname uniquify-non-file-buffer-names)))) |
13814 | 213 ;; 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
|
214 ;; may conflict, then bring conflicting names together |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
215 (uniquify-rationalize-a-list fix-list uniquify-min-dir-content))) |
13814 | 216 |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
217 ;; uniquify's version of buffer-file-name; result never contains trailing slash |
13814 | 218 (defun uniquify-buffer-file-name (buffer) |
219 "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
|
220 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
|
221 in `uniquify-list-buffers-directory-modes', otherwise returns nil." |
13814 | 222 (or (buffer-file-name buffer) |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
223 (with-current-buffer buffer |
19840
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
224 (and |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
225 (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
|
226 (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
|
227 (and list-buffers-directory |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
228 (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
|
229 ;; 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
|
230 (and dired-directory |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
231 (expand-file-name |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
232 (directory-file-name |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
233 (if (consp dired-directory) |
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
234 (car dired-directory) |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
235 dired-directory))))))))) |
13814 | 236 |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
237 (defun uniquify-item-greaterp (item1 item2) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
238 (string-lessp (uniquify-ref-proposed item2) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
239 (uniquify-ref-proposed item1))) |
13814 | 240 |
241 (defun uniquify-rationalize-a-list (fix-list depth) | |
19840
f66b5085a537
Use uniquify-file-name-nondirectory throughout; documentation tweaks.
Richard M. Stallman <rms@gnu.org>
parents:
19797
diff
changeset
|
242 (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
|
243 (old-proposed "") |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
244 proposed) |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
245 (dolist (item (sort fix-list 'uniquify-item-greaterp)) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
246 (setq proposed (uniquify-ref-proposed item)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
247 (unless (equal proposed old-proposed) |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
248 (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
|
249 old-proposed depth) |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
250 (setq conflicting-sublist nil)) |
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
251 (push item conflicting-sublist) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
252 (setq old-proposed proposed)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
253 (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
|
254 old-proposed depth))) |
13814 | 255 |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
256 (defun uniquify-get-proposed-name (base filename depth) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
257 (assert (equal base (uniquify-file-name-nondirectory filename))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
258 (assert (equal (directory-file-name filename) filename)) |
13814 | 259 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
260 ;; 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
|
261 (if (and uniquify-trailing-separator-p |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
262 (file-directory-p filename) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
263 (not (string-equal base ""))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
264 (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
|
265 (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
|
266 ;; (setq base (concat base "/"))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
267 ((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
|
268 (setq base (concat (or uniquify-separator "\\") base))))) |
13814 | 269 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
270 (let ((extra-string nil) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
271 (n depth)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
272 (while (and (> n 0) filename |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
273 (setq filename (file-name-directory filename)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
274 (setq filename (directory-file-name filename))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
275 (let ((file (file-name-nondirectory filename))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
276 (setq n (1- n)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
277 (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
|
278 (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
|
279 file) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
280 extra-string))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
281 (when (zerop n) |
40229
618f0d7df7a0
(uniquify-get-proposed-name): Fix (.. "usr" "/usr" 0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39559
diff
changeset
|
282 (if (and filename extra-string |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
283 (setq filename (file-name-directory filename)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
284 (equal filename |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
285 (file-name-directory (directory-file-name filename)))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
286 ;; 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
|
287 ;; 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
|
288 ;; "/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
|
289 (push "" extra-string)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
290 (setq uniquify-possibly-resolvable t)) |
13814 | 291 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
292 (cond |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
293 ((null extra-string) base) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
294 ((string-equal base "") ;Happens for dired buffers on the root directory. |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
295 (mapconcat 'identity extra-string (string directory-sep-char))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
296 ((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
|
297 (let ((dirsep (string directory-sep-char))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
298 (mapconcat 'identity |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
299 (cons base (nreverse extra-string)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
300 (or uniquify-separator "\\")))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
301 ((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
|
302 (mapconcat 'identity (nconc extra-string (list base)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
303 (string directory-sep-char))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
304 ((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
|
305 (concat base (or uniquify-separator "|") |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
306 (mapconcat 'identity extra-string (string directory-sep-char)))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
307 ((eq uniquify-buffer-name-style 'post-forward-angle-brackets) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
308 (concat base "<" (mapconcat 'identity extra-string |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
309 (string directory-sep-char)) ">")) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
310 (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
|
311 uniquify-buffer-name-style))))) |
13814 | 312 |
313 | |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
314 ;; 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
|
315 ;; "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
|
316 (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
|
317 (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
|
318 (if (or (cdr conf-list) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
319 (member old-name uniquify-non-file-buffer-names)) |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
320 (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
|
321 (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
|
322 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
|
323 (dolist (item conf-list) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
324 (uniquify-set-proposed item (uniquify-get-proposed-name |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
325 (uniquify-ref-base item) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
326 (uniquify-ref-filename item) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
327 depth))) |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
328 (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
|
329 (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
|
330 (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
|
331 |
13814 | 332 |
333 (defun uniquify-rename-buffer (item newname) | |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
334 (let ((buffer (uniquify-ref-buffer item))) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
335 (unless (equal newname (buffer-name buffer)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
336 (let ((unset (current-buffer)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
337 ;; avoid hooks on rename-buffer |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
338 (uniquify-buffer-name-style nil)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
339 (set-buffer buffer) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
340 (rename-buffer newname) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
341 (set-buffer unset))))) |
13814 | 342 |
343 ;;; Hooks from the rest of Emacs | |
344 | |
345 ;; The logical place to put all this code is in generate-new-buffer-name. | |
346 ;; It's written in C, so we would add a generate-new-buffer-name-function | |
347 ;; which, if non-nil, would be called instead of the C. One problem with | |
348 ;; that is that generate-new-buffer-name takes a potential buffer name as | |
349 ;; its argument -- not other information, such as what file the buffer will | |
350 ;; visit. | |
351 | |
352 ;; The below solution works because generate-new-buffer-name is called | |
353 ;; only by rename-buffer (which, as of 19.29, is never called from C) and | |
354 ;; generate-new-buffer, which is called only by Lisp functions | |
355 ;; create-file-buffer and rename-uniquely. Rename-uniquely generally | |
356 ;; isn't used for buffers visiting files, so it's sufficient to hook | |
357 ;; rename-buffer and create-file-buffer. (Setting find-file-hooks isn't | |
358 ;; sufficient.) | |
359 | |
360 (defadvice rename-buffer (after rename-buffer-uniquify activate) | |
361 "Uniquify buffer names with parts of directory name." | |
362 (if (and uniquify-buffer-name-style | |
363 ;; UNIQUE argument | |
364 (ad-get-arg 1)) | |
365 (progn | |
366 (if uniquify-after-kill-buffer-p | |
367 ;; call with no argument; rationalize vs. old name as well as new | |
368 (uniquify-rationalize-file-buffer-names) | |
369 ;; call with argument: rationalize vs. new name only | |
370 (uniquify-rationalize-file-buffer-names | |
371 (uniquify-buffer-file-name (current-buffer)) (current-buffer))) | |
372 (setq ad-return-value (buffer-name (current-buffer)))))) | |
373 | |
374 (defadvice create-file-buffer (after create-file-buffer-uniquify activate) | |
375 "Uniquify buffer names with parts of directory name." | |
376 (if uniquify-buffer-name-style | |
377 (uniquify-rationalize-file-buffer-names (ad-get-arg 0) ad-return-value))) | |
378 | |
379 ;; Buffer deletion | |
380 ;; Rerationalize after a buffer is killed, to reduce coinciding buffer names. | |
381 ;; This mechanism uses `kill-buffer-hook', which runs *before* deletion. | |
382 ;; That means that the kill-buffer-hook function cannot just delete the | |
383 ;; buffer -- it has to set something to do the rationalization *later*. | |
384 ;; It actually puts another function on `post-command-hook'. This other | |
385 ;; function runs the rationalization and then removes itself from the hook. | |
386 ;; Is there a better way to accomplish this? | |
387 ;; (This ought to set some global variables so the work is done only for | |
388 ;; buffers with names similar to the deleted buffer. -MDE) | |
389 | |
390 (defun delay-uniquify-rationalize-file-buffer-names () | |
391 "Add `delayed-uniquify-rationalize-file-buffer-names' to `post-command-hook'. | |
392 For use on, eg, `kill-buffer-hook', to rationalize *after* buffer deletion." | |
393 (if (and uniquify-buffer-name-style | |
394 uniquify-after-kill-buffer-p) | |
395 (add-hook 'post-command-hook | |
19123
056324b1fa58
(delay-uniquify-rationalize-file-buffer-names):
Richard M. Stallman <rms@gnu.org>
parents:
19044
diff
changeset
|
396 'delayed-uniquify-rationalize-file-buffer-names))) |
13814 | 397 |
398 (defun delayed-uniquify-rationalize-file-buffer-names () | |
399 "Rerationalize buffer names and remove self from `post-command-hook'. | |
400 See also `delay-rationalize-file-buffer-names' for hook setter." | |
401 (uniquify-rationalize-file-buffer-names) | |
402 (remove-hook 'post-command-hook | |
403 'delayed-uniquify-rationalize-file-buffer-names)) | |
404 | |
405 (add-hook 'kill-buffer-hook 'delay-uniquify-rationalize-file-buffer-names) | |
406 | |
407 ;;; uniquify.el ends here |