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