Mercurial > emacs
annotate lisp/uniquify.el @ 94301:9060af7294b9
(read-file-name): Don't let-bind default-directory.
Only abbreviate default-filename if it's a file.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 23 Apr 2008 18:37:50 +0000 |
parents | 0a7ef96a09e4 |
children | 377add9b3eb4 |
rev | line source |
---|---|
14295 | 1 ;;; uniquify.el --- unique buffer names dependent on file name |
13814 | 2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1989, 1995, 1996, 1997, 2001, 2002, 2003, |
79721 | 4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
13814 | 5 |
6 ;; Author: Dick King <king@reasoning.com> | |
36621 | 7 ;; Maintainer: FSF |
39117 | 8 ;; Keywords: files |
13814 | 9 ;; Created: 15 May 86 |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75347
diff
changeset
|
15 ;; the Free Software Foundation; either version 3, or (at your option) |
13814 | 16 ;; any later version. |
17 | |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
14169 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
13814 | 27 |
28 ;;; Commentary: | |
29 | |
30 ;; Emacs's standard method for making buffer names unique adds <2>, <3>, | |
91840
53e2227d1fae
(uniquify-buffer-base-name): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
31 ;; etc. to the end of (all but one of) the buffers. This file replaces |
13814 | 32 ;; that behavior, for buffers visiting files and dired buffers, with a |
14295 | 33 ;; uniquification that adds parts of the file name until the buffer names |
13814 | 34 ;; are unique. For instance, buffers visiting /u/mernst/tmp/Makefile and |
35 ;; /usr/projects/zaphod/Makefile would be named Makefile|tmp and | |
36 ;; Makefile|zaphod, respectively (instead of Makefile and Makefile<2>). | |
37 ;; Other buffer name styles are also available. | |
38 | |
18375
b547822f0a11
(delay-uniquify-rationalize-file-buffer-names): Remove this hook here,
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
39 ;; 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
|
40 ;; 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
|
41 |
13814 | 42 ;; For other options, see "User-visible variables", below. |
43 | |
13851
922f62608a55
(uniquify-fix-list-filename-lessp): Renamed from uniquify-filename-sort.
Richard M. Stallman <rms@gnu.org>
parents:
13814
diff
changeset
|
44 ;; 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
|
45 ;; and InfoDock is available from the maintainer. |
13814 | 46 |
47 ;;; Change Log: | |
48 | |
49 ;; 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
|
50 ;; Converted for Emacs 18 by Stephen Gildea <gildea@stop.mail-abuse.org> |
13814 | 51 ;; Make uniquify-min-dir-content 0 truly non-invasive. gildea 23 May 89 |
52 ;; Some cleanup. uniquify-min-dir-content default 0. gildea 01 Jun 89 | |
53 ;; Don't rename to "". Michael Ernst <mernst@theory.lcs.mit.edu> 15 Jun 94 | |
54 ;; Add kill-buffer-hook. Kenneth Manheimer <ken.manheimer@nist.gov> 09 May 95 | |
55 ;; Add advice for rename-buffer and create-file-buffer, handle dired buffers, | |
56 ;; kill-buffer-rationalize-buffer-names-p, documentation. mernst 24 May 95 | |
57 ;; Remove free variables, fix typos. mernst 5 Jun 95 | |
58 ;; Efficiently support Emacs 19.27 & earlier. ken.manheimer, mernst 10 Jun 95 | |
59 ;; Rename user options to "uniquify-...", add uniquify-reverse-dir-content-p, | |
60 ;; add uniquify-ask-about-buffer-names-p. king, mernst 13 Jun 95 | |
61 ;; Prefix functions by "uniquify-..."; rename mnemonic-buffer-names to | |
62 ;; uniquify-buffer-name-style; add 'forward and 'post-forward-angle-brackets | |
63 ;; styles; remove uniquify-reverse-dir-content-p; add | |
64 ;; 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
|
65 ;; 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
|
66 ;; 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
|
67 ;; 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
|
68 ;; 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
|
69 ;; 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
|
70 ;; Add uniquify-ignore-buffers-re. |
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
71 ;; 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
|
72 ;; Add uniquify-list-buffers-directory-modes |
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
73 ;; 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
|
74 ;; Algorithm and data structure changed to reduce consing with lots of buffers |
92304
0a7ef96a09e4
(uniquify-buffer-base-name): Undo last change. Should be
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92267
diff
changeset
|
75 ;; Francesco Potortì <pot@gnu.org> (ideas by rms and monnier) 2001-07-18 |
13814 | 76 |
77 ;; Valuable feedback was provided by | |
78 ;; Paul Smith <psmith@baynetworks.com>, | |
79 ;; Alastair Burt <burt@dfki.uni-kl.de>, | |
80 ;; Bob Weiner <weiner@footloose.sps.mot.com>, | |
81 ;; Albert L. Ting <alt@vlibs.com>, | |
17145
d342009009c7
(uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents:
14295
diff
changeset
|
82 ;; gyro@reasoning.com, |
d342009009c7
(uniquify-buffer-file-name): Don't call
Karl Heuer <kwzh@gnu.org>
parents:
14295
diff
changeset
|
83 ;; Bryan O'Sullivan <bos@eng.sun.com>. |
13814 | 84 |
85 | |
86 ;;; Code: | |
87 | |
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 |
64025
c101699af337
(uniquify): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
62531
diff
changeset
|
93 "Unique buffer names dependent on file name." |
17414
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 |
81969
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
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> | |
81969
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
107 nil name name<2> |
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
108 Of course, the \"mumble\" part may be stripped as well, depending on the setting |
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
109 of `uniquify-strip-common-suffix'." |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
110 :type '(radio (const forward) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
111 (const reverse) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
112 (const post-forward) |
19044
192305191a1f
(uniquify-buffer-name-style): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
18876
diff
changeset
|
113 (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
|
114 (const :tag "standard Emacs behavior (nil)" nil)) |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
115 :require 'uniquify |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
116 :group 'uniquify) |
13814 | 117 |
50971
28d8b4a38ce1
(uniquify-after-kill-buffer-p): Set default to t.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50945
diff
changeset
|
118 (defcustom uniquify-after-kill-buffer-p t |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
119 "If non-nil, rerationalize buffer names after a buffer has been killed." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
120 :type 'boolean |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
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 |
81969
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
124 "If non-nil, permit user to choose names for buffers with same base file. |
13814 | 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." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
127 :type 'boolean |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
128 :group 'uniquify) |
13814 | 129 |
50785
2fb36b4b42f5
(uniquify-ignore-buffers-re): Change default to match some Gnus buffers.
Richard M. Stallman <rms@gnu.org>
parents:
48833
diff
changeset
|
130 ;; The default value matches certain Gnus buffers. |
50971
28d8b4a38ce1
(uniquify-after-kill-buffer-p): Set default to t.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50945
diff
changeset
|
131 (defcustom uniquify-ignore-buffers-re nil |
81969
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
132 "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
|
133 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
|
134 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
|
135 visited file name isn't the same as that of the buffer." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
136 :type '(choice (const :tag "Uniquify all buffers" nil) regexp) |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
137 :group 'uniquify) |
22140
26e470569368
(uniquify-ignore-buffers-re): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20065
diff
changeset
|
138 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
139 (defcustom uniquify-min-dir-content 0 |
81969
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
140 "Minimum number of directory name components included in buffer name." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
141 :type 'integer |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
142 :group 'uniquify) |
13814 | 143 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
144 (defcustom uniquify-separator nil |
81969
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
145 "String separator for buffer name components. |
14295 | 146 When `uniquify-buffer-name-style' is `post-forward', separates |
13814 | 147 base file name from directory part in buffer names (default \"|\"). |
14295 | 148 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
|
149 file name components (default \"\\\")." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
150 :type '(choice (const nil) string) |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
151 :group 'uniquify) |
13814 | 152 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17145
diff
changeset
|
153 (defcustom uniquify-trailing-separator-p nil |
81969
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
154 "If non-nil, add a file name separator to dired buffer names. |
14295 | 155 If `uniquify-buffer-name-style' is `forward', add the separator at the end; |
156 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
|
157 variable is ignored." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
158 :type 'boolean |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
159 :group 'uniquify) |
13814 | 160 |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
161 (defcustom uniquify-strip-common-suffix |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
162 ;; Using it when uniquify-min-dir-content>0 doesn't make much sense. |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
163 (eq 0 uniquify-min-dir-content) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
164 "If non-nil, strip common directory suffixes of conflicting files. |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
165 E.g. if you open /a1/b/c/d and /a2/b/c/d, the buffer names will say |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
166 \"d|a1\" and \"d|a2\" instead of \"d|a1/b/c\" and \"d|a2/b/c\". |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
167 This can be handy when you have deep parallel hierarchies." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
168 :type 'boolean |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
59381
diff
changeset
|
169 :group 'uniquify) |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
170 |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
171 (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
|
172 "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
|
173 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
|
174 contains the name of the directory which the buffer is visiting.") |
13814 | 175 |
176 ;;; Utilities | |
177 | |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
178 ;; uniquify-fix-list data structure |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
179 (defstruct (uniquify-item |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
180 (:constructor nil) (:copier nil) |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
181 (:constructor uniquify-make-item |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
182 (base dirname buffer &optional proposed))) |
50876
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
183 base dirname buffer proposed) |
13814 | 184 |
185 ;; Internal variables used free | |
186 (defvar uniquify-possibly-resolvable nil) | |
187 | |
50844
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
188 (defvar uniquify-managed nil |
50877
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
189 "Non-nil if the name of this buffer is managed by uniquify. |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
190 It actually holds the list of `uniquify-item's corresponding to the conflict.") |
50844
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
191 (make-variable-buffer-local 'uniquify-managed) |
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
192 (put 'uniquify-managed 'permanent-local t) |
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
193 |
91840
53e2227d1fae
(uniquify-buffer-base-name): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
194 ;; Used in desktop.el to save the non-uniquified buffer name |
53e2227d1fae
(uniquify-buffer-base-name): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
195 (defun uniquify-buffer-base-name () |
53e2227d1fae
(uniquify-buffer-base-name): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
196 "Return the base name of the current buffer. |
92304
0a7ef96a09e4
(uniquify-buffer-base-name): Undo last change. Should be
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92267
diff
changeset
|
197 Return nil if the buffer is not managed by uniquify." |
91840
53e2227d1fae
(uniquify-buffer-base-name): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
198 (and uniquify-managed |
92304
0a7ef96a09e4
(uniquify-buffer-base-name): Undo last change. Should be
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92267
diff
changeset
|
199 (uniquify-item-base (car uniquify-managed)))) |
91840
53e2227d1fae
(uniquify-buffer-base-name): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
200 |
13814 | 201 ;;; Main entry point. |
202 | |
50914
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
203 (defun uniquify-rationalize-file-buffer-names (base dirname newbuf) |
33700
32c5f03d36c9
(uniquify-list-buffers-directory-modes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27686
diff
changeset
|
204 "Make file buffer names unique by adding segments from file name. |
13814 | 205 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
|
206 file name elements. |
50942
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
207 Arguments BASE, DIRNAME, and NEWBUF specify the new buffer that causes |
59380
7764df4e45e1
(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59130
diff
changeset
|
208 this rationalization." |
7764df4e45e1
(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59130
diff
changeset
|
209 (interactive |
7764df4e45e1
(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59130
diff
changeset
|
210 (list (if uniquify-managed |
7764df4e45e1
(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59130
diff
changeset
|
211 (uniquify-item-base (car uniquify-managed)) (buffer-name)) |
7764df4e45e1
(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59130
diff
changeset
|
212 (uniquify-buffer-file-name (current-buffer)) |
7764df4e45e1
(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59130
diff
changeset
|
213 (current-buffer))) |
59381
77618102ddc4
(uniquify-rationalize-file-buffer-names): Fix corner case when renaming
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59380
diff
changeset
|
214 ;; Make sure we don't get confused by outdated uniquify-managed info in |
77618102ddc4
(uniquify-rationalize-file-buffer-names): Fix corner case when renaming
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59380
diff
changeset
|
215 ;; this buffer. |
77618102ddc4
(uniquify-rationalize-file-buffer-names): Fix corner case when renaming
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59380
diff
changeset
|
216 (with-current-buffer newbuf (setq uniquify-managed nil)) |
77618102ddc4
(uniquify-rationalize-file-buffer-names): Fix corner case when renaming
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59380
diff
changeset
|
217 (when dirname |
50914
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
218 (setq dirname (expand-file-name (directory-file-name dirname))) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
219 (let ((fix-list (list (uniquify-make-item base dirname newbuf))) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
220 items) |
50883
7b95d60a7574
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50877
diff
changeset
|
221 (dolist (buffer (buffer-list)) |
50914
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
222 (when (and (not (and uniquify-ignore-buffers-re |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
223 (string-match uniquify-ignore-buffers-re |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
224 (buffer-name buffer)))) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
225 ;; Only try to rename buffers we actually manage. |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
226 (setq items (buffer-local-value 'uniquify-managed buffer)) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
227 (equal base (uniquify-item-base (car items))) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
228 ;; Don't re-add stuff we already have. Actually this |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
229 ;; whole `and' test should only match at most once. |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
230 (not (memq (car items) fix-list))) |
50942
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
231 (unless (cdr items) |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
232 ;; If there was no conflict, the buffer-name is equal to the |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
233 ;; base-name and we may have missed a rename-buffer because |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
234 ;; of code like in set-visited-file-name: |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
235 ;; (or (string= new-name (buffer-name)) (rename-buffer new-name t)) |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
236 ;; So we need to refresh the dirname of the uniquify-item. |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
237 (setf (uniquify-item-dirname (car items)) |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
238 (uniquify-buffer-file-name |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
239 (uniquify-item-buffer (car items)))) |
50971
28d8b4a38ce1
(uniquify-after-kill-buffer-p): Set default to t.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50945
diff
changeset
|
240 ;; This shouldn't happen, but maybe there's no dirname any more. |
50942
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
241 (unless (uniquify-item-dirname (car items)) |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
242 (with-current-buffer (uniquify-item-buffer (car items)) |
50945
4151ece07b08
(uniquify-rationalize-file-buffer-names): Thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50942
diff
changeset
|
243 (setq uniquify-managed nil)) |
4151ece07b08
(uniquify-rationalize-file-buffer-names): Thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50942
diff
changeset
|
244 (setq items nil))) |
78659
01a61e30fa32
(uniquify-rationalize-file-buffer-names): Check liveness
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
245 ;; In case we missed some calls to kill-buffer, there may be dead |
01a61e30fa32
(uniquify-rationalize-file-buffer-names): Check liveness
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
246 ;; buffers in uniquify-managed, so filter them out. |
01a61e30fa32
(uniquify-rationalize-file-buffer-names): Check liveness
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
247 (setq items |
01a61e30fa32
(uniquify-rationalize-file-buffer-names): Check liveness
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
248 (delq nil (mapcar |
01a61e30fa32
(uniquify-rationalize-file-buffer-names): Check liveness
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
249 (lambda (item) |
01a61e30fa32
(uniquify-rationalize-file-buffer-names): Check liveness
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
250 (if (buffer-live-p (uniquify-item-buffer item)) |
01a61e30fa32
(uniquify-rationalize-file-buffer-names): Check liveness
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
251 item)) |
01a61e30fa32
(uniquify-rationalize-file-buffer-names): Check liveness
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
252 items))) |
50914
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
253 (setq fix-list (append fix-list items)))) |
50883
7b95d60a7574
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50877
diff
changeset
|
254 ;; selects buffers whose names may need changing, and others that |
7b95d60a7574
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50877
diff
changeset
|
255 ;; may conflict, then bring conflicting names together |
7b95d60a7574
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50877
diff
changeset
|
256 (uniquify-rationalize fix-list)))) |
13814 | 257 |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
258 ;; uniquify's version of buffer-file-name; result never contains trailing slash |
13814 | 259 (defun uniquify-buffer-file-name (buffer) |
50914
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
260 "Return name of directory, 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
|
261 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
|
262 in `uniquify-list-buffers-directory-modes', otherwise returns nil." |
50914
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
263 (with-current-buffer buffer |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
264 (let ((filename |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
265 (or buffer-file-name |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
266 (if (memq major-mode uniquify-list-buffers-directory-modes) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
267 list-buffers-directory)))) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
268 (when filename |
50942
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
269 (directory-file-name |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
270 (file-name-directory |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
271 (expand-file-name |
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
272 (directory-file-name filename)))))))) |
13814 | 273 |
50877
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
274 (defun uniquify-rerationalize-w/o-cb (fix-list) |
81969
d0dd4d423df4
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
275 "Re-rationalize the buffers in FIX-LIST, but ignoring `current-buffer'." |
50877
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
276 (let ((new-fix-list nil)) |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
277 (dolist (item fix-list) |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
278 (let ((buf (uniquify-item-buffer item))) |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
279 (unless (or (eq buf (current-buffer)) (not (buffer-live-p buf))) |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
280 (push item new-fix-list)))) |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
281 (when new-fix-list |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
282 (uniquify-rationalize new-fix-list)))) |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
283 |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
284 (defun uniquify-rationalize (fix-list) |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
285 ;; Set up uniquify to re-rationalize after killing/renaming |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
286 ;; if there is a conflict. |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
287 (dolist (item fix-list) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
288 (with-current-buffer (uniquify-item-buffer item) |
50942
46d187316243
(uniquify-rationalize-file-buffer-names):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50914
diff
changeset
|
289 ;; Refresh the dirnames and proposed names. |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
290 (setf (uniquify-item-proposed item) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
291 (uniquify-get-proposed-name (uniquify-item-base item) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
292 (uniquify-item-dirname item))) |
50877
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
293 (setq uniquify-managed fix-list))) |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
294 ;; Strip any shared last directory names of the dirname. |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
295 (when (and (cdr fix-list) uniquify-strip-common-suffix) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
296 (let ((strip t)) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
297 (while (let* ((base (file-name-nondirectory |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
298 (uniquify-item-dirname (car fix-list)))) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
299 (items fix-list)) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
300 (when (> (length base) 0) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
301 (while (and strip items) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
302 (unless (equal base (file-name-nondirectory |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
303 (uniquify-item-dirname (pop items)))) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
304 (setq strip nil))) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
305 strip)) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
306 ;; It's all the same => strip. |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
307 (dolist (item (prog1 fix-list (setq fix-list nil))) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
308 ;; Create new items because the old ones are kept (with the true |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
309 ;; `dirname') for later rerationalizing. |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
310 (push (uniquify-make-item (uniquify-item-base item) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
311 (let ((f (file-name-directory |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
312 (uniquify-item-dirname item)))) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
313 (and f (directory-file-name f))) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
314 (uniquify-item-buffer item) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
315 (uniquify-item-proposed item)) |
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
316 fix-list))))) |
50877
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
317 ;; If uniquify-min-dir-content is 0, this will end up just |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
318 ;; passing fix-list to uniquify-rationalize-conflicting-sublist. |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
319 (uniquify-rationalize-a-list fix-list)) |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
320 |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
321 (defun uniquify-item-greaterp (item1 item2) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
322 (string-lessp (uniquify-item-proposed item2) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
323 (uniquify-item-proposed item1))) |
13814 | 324 |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
325 (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
|
326 (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
|
327 (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
|
328 (old-proposed "") |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
329 proposed) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
330 ;; 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
|
331 ;; 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
|
332 (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
|
333 (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
|
334 (unless (equal proposed old-proposed) |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
335 (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
|
336 old-proposed depth) |
38536
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
337 (setq conflicting-sublist nil)) |
09aca87f88ce
Overall speedup when using many buffers.
Francesco Potortì <pot@gnu.org>
parents:
38222
diff
changeset
|
338 (push item conflicting-sublist) |
38665
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
339 (setq old-proposed proposed)) |
876a8018d21f
Code cleanup, speed and consing improvements for uniquify.el.
Francesco Potortì <pot@gnu.org>
parents:
38651
diff
changeset
|
340 (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
|
341 old-proposed depth))) |
13814 | 342 |
50876
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
343 (defun uniquify-get-proposed-name (base dirname &optional depth) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
344 (unless depth (setq depth uniquify-min-dir-content)) |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
345 (assert (equal (directory-file-name dirname) dirname)) ;No trailing slash. |
13814 | 346 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
347 ;; 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
|
348 (if (and uniquify-trailing-separator-p |
50876
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
349 (file-directory-p (expand-file-name base dirname)) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
350 (not (string-equal base ""))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
351 (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
|
352 (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
|
353 ;; (setq base (concat base "/"))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
354 ((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
|
355 (setq base (concat (or uniquify-separator "\\") base))))) |
13814 | 356 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
357 (let ((extra-string nil) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
358 (n depth)) |
50876
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
359 (while (and (> n 0) dirname) |
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
360 (let ((file (file-name-nondirectory dirname))) |
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
361 (when (setq dirname (file-name-directory dirname)) |
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
362 (setq dirname (directory-file-name dirname))) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
363 (setq n (1- n)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
364 (push (if (zerop (length file)) ;nil or "". |
50906
0dc88196f313
(uniquify-after-kill-buffer-p): Fix misleading docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50883
diff
changeset
|
365 (prog1 "" (setq dirname nil)) ;Could be `dirname' iso "". |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
366 file) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
367 extra-string))) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
368 (when (zerop n) |
50876
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
369 (if (and dirname extra-string |
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
370 (equal dirname (file-name-directory dirname))) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
371 ;; 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
|
372 ;; 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
|
373 ;; "/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
|
374 (push "" extra-string)) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
375 (setq uniquify-possibly-resolvable t)) |
13814 | 376 |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
377 (cond |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
378 ((null extra-string) base) |
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
379 ((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
|
380 (mapconcat 'identity extra-string "/")) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
381 ((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
|
382 (mapconcat 'identity |
9925c06ca5fb
(uniquify-get-proposed-name): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
47644
diff
changeset
|
383 (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
|
384 (or uniquify-separator "\\"))) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
385 ((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
|
386 (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
|
387 "/")) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
388 ((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
|
389 (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
|
390 (mapconcat 'identity extra-string "/"))) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
391 ((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
|
392 (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
|
393 ">")) |
39559
5851ee3f83f5
(uniquify-get-proposed-name): Don't assume dirsep is /.
Gerd Moellmann <gerd@gnu.org>
parents:
39400
diff
changeset
|
394 (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
|
395 uniquify-buffer-name-style))))) |
13814 | 396 |
397 | |
19797
646589bc370b
Rename uniquify-fix-list-* to uniquify-fix-item-*.
Richard M. Stallman <rms@gnu.org>
parents:
19755
diff
changeset
|
398 ;; 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
|
399 ;; "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
|
400 (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
|
401 (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
|
402 (if (or (cdr conf-list) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
403 ;; 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
|
404 ;; existing buffer. |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
405 (let ((buf (get-buffer old-name))) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
406 (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
|
407 (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
|
408 (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
|
409 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
|
410 (dolist (item conf-list) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
411 (setf (uniquify-item-proposed item) |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
412 (uniquify-get-proposed-name |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
413 (uniquify-item-base item) |
50876
3311a93359a2
(uniquify-item, uniquify-get-proposed-name)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50844
diff
changeset
|
414 (uniquify-item-dirname item) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
415 depth))) |
38651
683a60ba2533
These changes correct a corner case that the old code managed correctly.
Francesco Potortì <pot@gnu.org>
parents:
38641
diff
changeset
|
416 (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
|
417 (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
|
418 (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
|
419 |
13814 | 420 |
421 (defun uniquify-rename-buffer (item newname) | |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
422 (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
|
423 (unless (equal newname (buffer-name buffer)) |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
424 (with-current-buffer buffer |
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
425 (let ((uniquify-buffer-name-style nil)) ;Avoid hooks on rename-buffer. |
50844
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
426 ;; Pass the `unique' arg, so the advice doesn't mark it as unmanaged. |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
427 (rename-buffer newname t)))))) |
13814 | 428 |
429 ;;; Hooks from the rest of Emacs | |
430 | |
79247
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
431 ;; Buffer deletion |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
432 ;; Rerationalize after a buffer is killed, to reduce coinciding buffer names. |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
433 ;; This mechanism uses `kill-buffer-hook', which runs *before* deletion, so |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
434 ;; it calls `uniquify-rerationalize-w/o-cb' to rerationalize the buffer list |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
435 ;; ignoring the current buffer (which is going to be deleted anyway). |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
436 (defun uniquify-maybe-rerationalize-w/o-cb () |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
437 "Re-rationalize buffer names, ignoring current buffer. |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
438 For use on `kill-buffer-hook'." |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
439 (if (and (cdr uniquify-managed) |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
440 uniquify-buffer-name-style |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
441 uniquify-after-kill-buffer-p) |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
442 (uniquify-rerationalize-w/o-cb uniquify-managed))) |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
443 |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
444 ;; Ideally we'd like to add it buffer-locally, but that doesn't work |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
445 ;; because kill-buffer-hook is not permanent-local :-( |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
446 (add-hook 'kill-buffer-hook 'uniquify-maybe-rerationalize-w/o-cb) |
cacef917c670
(uniquify-maybe-rerationalize-w/o-cb): Define it before use
Juanma Barranquero <lekktu@gmail.com>
parents:
79239
diff
changeset
|
447 |
13814 | 448 ;; The logical place to put all this code is in generate-new-buffer-name. |
449 ;; It's written in C, so we would add a generate-new-buffer-name-function | |
450 ;; which, if non-nil, would be called instead of the C. One problem with | |
451 ;; that is that generate-new-buffer-name takes a potential buffer name as | |
452 ;; its argument -- not other information, such as what file the buffer will | |
453 ;; visit. | |
454 | |
455 ;; The below solution works because generate-new-buffer-name is called | |
456 ;; only by rename-buffer (which, as of 19.29, is never called from C) and | |
457 ;; generate-new-buffer, which is called only by Lisp functions | |
458 ;; create-file-buffer and rename-uniquely. Rename-uniquely generally | |
459 ;; 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
|
460 ;; rename-buffer and create-file-buffer. (Setting find-file-hook isn't |
13814 | 461 ;; sufficient.) |
462 | |
463 (defadvice rename-buffer (after rename-buffer-uniquify activate) | |
464 "Uniquify buffer names with parts of directory name." | |
50877
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
465 (uniquify-maybe-rerationalize-w/o-cb) |
50844
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
466 (if (null (ad-get-arg 1)) ; no UNIQUE argument. |
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
467 ;; Mark this buffer so it won't be renamed by uniquify. |
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
468 (setq uniquify-managed nil) |
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
469 (when uniquify-buffer-name-style |
50877
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
470 ;; Rerationalize w.r.t the new name. |
c701779986a1
(uniquify-rationalize): New fun. Store the fix-list in uniquify-managed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50876
diff
changeset
|
471 (uniquify-rationalize-file-buffer-names |
50914
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
472 (ad-get-arg 0) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
473 (uniquify-buffer-file-name (current-buffer)) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
474 (current-buffer)) |
50844
86903fed9f75
(uniquify-managed): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50826
diff
changeset
|
475 (setq ad-return-value (buffer-name (current-buffer)))))) |
13814 | 476 |
477 (defadvice create-file-buffer (after create-file-buffer-uniquify activate) | |
478 "Uniquify buffer names with parts of directory name." | |
479 (if uniquify-buffer-name-style | |
50914
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
480 (let ((filename (expand-file-name (directory-file-name (ad-get-arg 0))))) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
481 (uniquify-rationalize-file-buffer-names |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
482 (file-name-nondirectory filename) |
26edd9033fca
Use the original buffer-name as `base' in place of the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50906
diff
changeset
|
483 (file-name-directory filename) ad-return-value)))) |
13814 | 484 |
79249
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
485 ;;; The End |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
486 |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
487 (defun uniquify-unload-function () |
79257
60995c957b44
(uniquify-unload-function): Add docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
79249
diff
changeset
|
488 "Unload the uniquify library." |
79249
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
489 (save-current-buffer |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
490 (let ((buffers nil)) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
491 (dolist (buf (buffer-list)) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
492 (set-buffer buf) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
493 (when uniquify-managed |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
494 (push (cons buf (uniquify-item-base (car uniquify-managed))) buffers))) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
495 (dolist (fun '(rename-buffer create-file-buffer)) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
496 (ad-remove-advice fun 'after (intern (concat (symbol-name fun) "-uniquify"))) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
497 (ad-update fun)) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
498 (dolist (buf buffers) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
499 (set-buffer (car buf)) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
500 (rename-buffer (cdr buf) t)))) |
91840
53e2227d1fae
(uniquify-buffer-base-name): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
501 ;; continue standard unloading |
79249
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
502 nil) |
ed916d33c5ff
(uniquify-unload-function): New function and var.
Juanma Barranquero <lekktu@gmail.com>
parents:
79247
diff
changeset
|
503 |
50814
28d06c5071e1
Move provide to end of file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50785
diff
changeset
|
504 (provide 'uniquify) |
52401 | 505 |
59380
7764df4e45e1
(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59130
diff
changeset
|
506 ;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065 |
13814 | 507 ;;; uniquify.el ends here |