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