annotate lisp/utils/uniquify.el @ 173:8eaf7971accc r20-3b13

Import from CVS: tag r20-3b13
author cvs
date Mon, 13 Aug 2007 09:49:09 +0200
parents 3bb7ccffb0c0
children 489f57a838ef
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
1 ;;; uniquify.el --- unique buffer names dependent on file name
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
2
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
3 ;; Copyright (c) 1989, 1995, 1996, 1997 Free Software Foundation, Inc.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
4
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
5 ;; Author: Dick King <king@reasoning.com>
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
6 ;; Maintainer: Michael Ernst <mernst@theory.lcs.mit.edu>
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
7 ;; Created: 15 May 86
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
8 ;; Time-stamp: <97/03/03 17:16:23 mernst>
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
9
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
11
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
12 ;; GNU Emacs is free software; you can redistribute it and/or modify
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
14 ;; the Free Software Foundation; either version 2, or (at your option)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
15 ;; any later version.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
16
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
20 ;; GNU General Public License for more details.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
21
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
23 ;; along with GNU Emacs; see the file COPYING. If not, write to
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
24 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
25
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
26 ;;; Commentary:
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
27
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
28 ;; Emacs's standard method for making buffer names unique adds <2>, <3>,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
29 ;; etc. to the end of (all but one of) the buffers. This file replaces
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
30 ;; that behavior, for buffers visiting files and dired buffers, with a
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
31 ;; uniquification that adds parts of the file name until the buffer names
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
32 ;; are unique. For instance, buffers visiting /u/mernst/tmp/Makefile and
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
33 ;; /usr/projects/zaphod/Makefile would be named Makefile|tmp and
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
34 ;; Makefile|zaphod, respectively (instead of Makefile and Makefile<2>).
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
35 ;; Other buffer name styles are also available.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
36
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
37 ;; To use this file, just load it; or add (require 'uniquify) to your .emacs.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
38 ;; To disable it after loading, set variable uniquify-buffer-name-style to nil.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
39 ;; For other options, see "User-visible variables", below.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
40
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
41 ;; uniquify.el works under Emacs 18, Emacs 19, XEmacs, and InfoDock.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
42
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
43 ;; Doesn't correctly handle buffer names created by M-x write-file in Emacs 18.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
44 ;; Doesn't work under NT when backslash is used as a path separator (forward
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
45 ;; slash path separator works fine). To fix, check system-type against
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
46 ;; 'windows-nt, write a routine that breaks paths down into components.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
47 ;; (Surprisingly, there isn't one built in.)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
48
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
49 ;;; Change Log:
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
50
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
51 ;; Originally by Dick King <king@reasoning.com> 15 May 86
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
52 ;; Converted for Emacs 18 by Stephen Gildea <gildea@lcs.mit.edu>
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
53 ;; Make uniquify-min-dir-content 0 truly non-invasive. gildea 23 May 89
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
54 ;; Some cleanup. uniquify-min-dir-content default 0. gildea 01 Jun 89
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
55 ;; Don't rename to "". Michael Ernst <mernst@theory.lcs.mit.edu> 15 Jun 94
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
56 ;; Add kill-buffer-hook. Kenneth Manheimer <ken.manheimer@nist.gov> 09 May 95
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
57 ;; Add advice for rename-buffer and create-file-buffer, handle dired buffers,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
58 ;; kill-buffer-rationalize-buffer-names-p, documentation. mernst 24 May 95
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
59 ;; Remove free variables, fix typos. mernst 5 Jun 95
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
60 ;; Efficiently support Emacs 19.27 & earlier. ken.manheimer, mernst 10 Jun 95
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
61 ;; Rename user options to "uniquify-...", add uniquify-reverse-dir-content-p,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
62 ;; add uniquify-ask-about-buffer-names-p. king, mernst 13 Jun 95
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
63 ;; Prefix functions by "uniquify-..."; rename mnemonic-buffer-names to
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
64 ;; uniquify-buffer-name-style; add 'forward and 'post-forward-angle-brackets
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
65 ;; styles; remove uniquify-reverse-dir-content-p; add
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
66 ;; uniquify-trailing-separator-p. mernst 4 Aug 95
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
67 ;; Don't call expand-file-name on nil. mernst 7 Jan 96
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
68 ;; Check whether list-buffers-directory is bound. mernst 11 Oct 96
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
69 ;; Ignore non-file non-dired buffers. Colin Rafferty <craffert@ml.com> 3 Mar 97
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
70
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
71 ;; Valuable feedback was provided by
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
72 ;; Paul Smith <psmith@baynetworks.com>,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
73 ;; Alastair Burt <burt@dfki.uni-kl.de>,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
74 ;; Bob Weiner <weiner@footloose.sps.mot.com>,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
75 ;; Albert L. Ting <alt@vlibs.com>,
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
76 ;; gyro@reasoning.com,
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
77 ;; Bryan O'Sullivan <bos@eng.sun.com>.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
78
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
79
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
80 ;;; Code:
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
81
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
82 (provide 'uniquify)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
83
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
84 ;;; User-visible variables
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
85
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 159
diff changeset
86 (progn
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 159
diff changeset
87 (defgroup uniquify nil
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 159
diff changeset
88 "Unique buffer names dependent on file name"
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 159
diff changeset
89 :group 'applications)
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 159
diff changeset
90 )
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
91
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
92
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
93 (defcustom uniquify-buffer-name-style 'post-forward
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
94 "*If non-nil, buffer names are uniquified with parts of directory name.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
95 The value determines the buffer name style and is one of `forward',
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
96 `reverse', `post-forward' (the default), or `post-forward-angle-brackets'.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
97 For example, files `/foo/bar/mumble/name' and `/baz/quux/mumble/name'
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
98 would have the following buffer names in the various styles:
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
99 forward bar/mumble/name quux/mumble/name
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
100 reverse name\\mumble\\bar name\\mumble\\quux
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
101 post-forward name|bar/mumble name|quux/mumble
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
102 post-forward-angle-brackets name<bar/mumble> name<quux/mumble>
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
103 nil name name<2>"
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
104 :type '(radio (const forward)
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
105 (const reverse)
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
106 (const post-forward)
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
107 (const podt-forward-angle-brackets)
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
108 (const nil))
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
109 :group 'uniquify)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
110
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
111 (defcustom uniquify-after-kill-buffer-p nil
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
112 "*If non-nil, rerationalize buffer names after a buffer has been killed.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
113 This can be dangerous if Emacs Lisp code is keeping track of buffers by their
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
114 names (rather than keeping pointers to the buffers themselves)."
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
115 :type 'boolean
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
116 :group 'uniquify)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
117
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
118 (defcustom uniquify-ask-about-buffer-names-p nil
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
119 "*If non-nil, permit user to choose names for buffers with same base file.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
120 If the user chooses to name a buffer, uniquification is preempted and no
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
121 other buffer names are changed."
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
122 :type 'boolean
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
123 :group 'uniquify)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
124
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
125 (defcustom uniquify-min-dir-content 0
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
126 "*Minimum parts of directory name included in buffer name."
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
127 :type 'integer
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
128 :group 'uniquify)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
129
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
130 (defcustom uniquify-separator nil
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
131 "*String separator for buffer name components.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
132 When `uniquify-buffer-name-style' is `post-forward', separates
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
133 base file name from directory part in buffer names (default \"|\").
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
134 When `uniquify-buffer-name-style' is `reverse', separates all
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
135 file name components (default \"\\\")."
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
136 :type '(choice (const nil) string)
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
137 :group 'uniquify)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
138
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
139 (defcustom uniquify-trailing-separator-p nil
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
140 "*If non-nil, add a file name separator to dired buffer names.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
141 If `uniquify-buffer-name-style' is `forward', add the separator at the end;
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
142 if it is `reverse', add the separator at the beginning; otherwise, this
134
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
143 variable is ignored."
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
144 :type 'boolean
34a5b81f86ba Import from CVS: tag r20-2b1
cvs
parents: 108
diff changeset
145 :group 'uniquify)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
146
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
147
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
148 ;;; Utilities
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
149
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
150 (defmacro uniquify-push (item list)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
151 (` (setq (, list) (cons (, item) (, list)))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
152
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
153 (defmacro uniquify-fix-list-base (a)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
154 (` (car (, a))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
155
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
156 (defmacro uniquify-fix-list-filename (a)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
157 (` (car (cdr (, a)))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
158
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
159 (defmacro uniquify-fix-list-buffer (a)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
160 (` (car (cdr (cdr (, a))))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
161
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
162 (defmacro uniquify-cadddr (a)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
163 (` (car (cdr (cdr (cdr (, a)))))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
164
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
165 ;; Internal variables used free
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
166 (defvar uniquify-non-file-buffer-names nil)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
167 (defvar uniquify-possibly-resolvable nil)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
168
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
169 ;;; Main entry point.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
170
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
171 (defun uniquify-rationalize-file-buffer-names (&optional newbuffile newbuf)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
172 "Makes file buffer names unique by adding segments from file name.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
173 If `uniquify-min-dir-content' > 0, always pulls that many
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
174 file name elements. Arguments cause only a subset of buffers to be renamed."
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
175 (interactive)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
176 (let (fix-list
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
177 uniquify-non-file-buffer-names
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
178 (depth uniquify-min-dir-content))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
179 (let ((buffers (buffer-list)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
180 (while buffers
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
181 (let* ((buffer (car buffers))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
182 (bfn (if (eq buffer newbuf)
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
183 (and newbuffile
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
184 (expand-file-name newbuffile))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
185 (uniquify-buffer-file-name buffer)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
186 (rawname (and bfn (file-name-nondirectory bfn)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
187 (deserving (and rawname
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
188 (or (not newbuffile)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
189 (equal rawname
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
190 (file-name-nondirectory newbuffile))))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
191 (if deserving
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
192 (uniquify-push (list rawname bfn buffer nil) fix-list)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
193 (uniquify-push (list (buffer-name buffer))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
194 uniquify-non-file-buffer-names)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
195 (setq buffers (cdr buffers))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
196 ;; selects buffers whose names may need changing, and others that
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
197 ;; may conflict.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
198 (setq fix-list
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
199 (sort fix-list 'uniquify-fix-list-filename-lessp))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
200 ;; bringing conflicting names together
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
201 (uniquify-rationalize-a-list fix-list depth)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
202 (mapcar 'uniquify-unrationalized-buffer fix-list)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
203
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
204 ;; uniquify's version of buffer-file-name
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
205 (defun uniquify-buffer-file-name (buffer)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
206 "Return name of file BUFFER is visiting, or nil if none.
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
207 Works on dired buffers as well as ordinary file-visiting buffers,
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
208 but no others."
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
209 (or (buffer-file-name buffer)
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
210 (and (featurep 'dired)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
211 (save-excursion
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
212 (set-buffer buffer)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
213 (and
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
214 (eq major-mode 'dired-mode) ; do nothing if not a dired buffer
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
215 (if (boundp 'list-buffers-directory) ; XEmacs mightn't define this
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
216 list-buffers-directory
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
217 ;; don't use default-directory if dired-directory is nil
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
218 (and dired-directory
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
219 (expand-file-name
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
220 (directory-file-name
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
221 (if (consp dired-directory)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
222 (car dired-directory)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
223 dired-directory))))))))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
224
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
225 (defun uniquify-fix-list-filename-lessp (fixlist1 fixlist2)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
226 (uniquify-filename-lessp
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
227 (uniquify-fix-list-filename fixlist1) (uniquify-fix-list-filename fixlist2)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
228
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
229 ;; This examines the filename components in reverse order.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
230 (defun uniquify-filename-lessp (s1 s2)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
231 (let ((s1f (file-name-nondirectory s1))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
232 (s2f (file-name-nondirectory s2)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
233 (and (not (equal s2f ""))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
234 (or (string-lessp s1f s2f)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
235 (and (equal s1f s2f)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
236 (let ((s1d (file-name-directory s1))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
237 (s2d (file-name-directory s2)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
238 (and (not (<= (length s2d) 1))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
239 (or (<= (length s1d) 1)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
240 (uniquify-filename-lessp
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
241 (substring s1d 0 -1)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
242 (substring s2d 0 -1))))))))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
243
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
244 ;; Was named do-the-buffers-you-couldnt-rationalize
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
245 (defun uniquify-unrationalized-buffer (item)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
246 (or (uniquify-cadddr item) nil)) ;maybe better in the future
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
247
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
248 (defun uniquify-rationalize-a-list (fix-list depth)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
249 (let (conflicting-sublist
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
250 (old-name "")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
251 proposed-name uniquify-possibly-resolvable)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
252 (while fix-list
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
253 (let ((item (car fix-list)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
254 (setq proposed-name (uniquify-get-proposed-name item depth))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
255 (if (not (equal proposed-name old-name))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
256 (progn
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
257 (uniquify-rationalize-conflicting-sublist
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
258 conflicting-sublist old-name depth)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
259 (setq conflicting-sublist nil)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
260 (uniquify-push item conflicting-sublist)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
261 (setq old-name proposed-name))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
262 (setq fix-list (cdr fix-list)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
263 (uniquify-rationalize-conflicting-sublist
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
264 conflicting-sublist old-name depth)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
265
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
266 (defun uniquify-get-proposed-name (item depth)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
267 (let (index
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
268 (extra-string "")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
269 (n depth)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
270 (base (uniquify-fix-list-base item))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
271 (fn (uniquify-fix-list-filename item)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
272 (while (and (> n 0)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
273 (setq index (string-match
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
274 (concat "\\(^\\|/[^/]*\\)/"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
275 (regexp-quote extra-string)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
276 (regexp-quote base)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
277 "\\'")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
278 fn)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
279 (setq extra-string (substring fn
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
280 (if (zerop index) 0 (1+ index))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
281 ;; (- (length base)) fails for base = "".
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
282 ;; Equivalently, we could have used
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
283 ;; (apply 'substring ...
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
284 ;; (and (not (string= "" base))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
285 ;; (list (- (length base)))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
286 (- (length fn) (length base)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
287 n (1- n)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
288 (if (zerop n) (setq uniquify-possibly-resolvable t))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
289
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
290
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
291 ;; Distinguish directories by adding extra separator.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
292 (if (and uniquify-trailing-separator-p
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
293 (file-directory-p fn)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
294 (not (string-equal base "")))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
295 (cond ((eq uniquify-buffer-name-style 'forward)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
296 (setq base (concat base "/")))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
297 ((eq uniquify-buffer-name-style 'reverse)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
298 (setq base (concat (or uniquify-separator "\\") base)))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
299
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
300 ;; Trim trailing separator on directory part
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
301 (if (and (not (string-equal extra-string ""))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
302 (or (eq uniquify-buffer-name-style 'post-forward)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
303 (eq uniquify-buffer-name-style 'post-forward-angle-brackets)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
304 (setq extra-string (substring extra-string 0
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
305 (- (length extra-string) 1))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
306
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
307 (cond ((string-equal extra-string "")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
308 base)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
309 ((string-equal base "")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
310 extra-string)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
311 ((eq uniquify-buffer-name-style 'forward)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
312 (concat extra-string base))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
313 ((eq uniquify-buffer-name-style 'reverse)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
314 (concat base (uniquify-reverse-components extra-string)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
315 ((eq uniquify-buffer-name-style 'post-forward)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
316 (concat base (or uniquify-separator "|") extra-string))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
317 ((eq uniquify-buffer-name-style 'post-forward-angle-brackets)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
318 (concat base "<" extra-string ">"))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
319 (t (error "Bad value for uniquify-buffer-name-style: %s"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
320 uniquify-buffer-name-style)))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
321
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
322
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
323 ;; Deal with conflicting-sublist, which is set by uniquify-rationalize-a-list.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
324 ;; This is only called by uniquify-rationalize-a-list.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
325 (defun uniquify-rationalize-conflicting-sublist (conflicting-sublist old-name depth)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
326 (or (null conflicting-sublist)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
327 (and (null (cdr conflicting-sublist))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
328 (not (assoc old-name uniquify-non-file-buffer-names))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
329 (or (and (not (string= old-name ""))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
330 (uniquify-rename-buffer (car conflicting-sublist) old-name))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
331 t))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
332 (if uniquify-possibly-resolvable
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
333 (uniquify-rationalize-a-list conflicting-sublist (1+ depth)))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
334
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
335 (defun uniquify-rename-buffer (item newname)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
336 (let ((buffer (uniquify-fix-list-buffer item)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
337 (if (not (equal newname (buffer-name buffer)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
338 (let ((unset (current-buffer))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
339 ;; avoid hooks on rename-buffer
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
340 (uniquify-buffer-name-style nil))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
341 (set-buffer buffer)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
342 (rename-buffer newname)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
343 (set-buffer unset))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
344 (rplaca (nthcdr 3 item) t))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
345
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
346 (defun uniquify-reverse-components (instring)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
347 (let ((sofar '())
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
348 (cursor 0)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
349 (len (length instring))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
350 (sep (or uniquify-separator "\\")))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
351 (while (< cursor len)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
352 (if (= (aref instring cursor) ?/)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
353 (setq sofar (cons sep sofar)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
354 cursor (1+ cursor))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
355 (let ((first-slash (or (string-match "/" instring cursor) len)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
356 (setq sofar (cons (substring instring cursor first-slash) sofar)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
357 cursor first-slash))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
358 (apply (function concat) sofar)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
359
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
360
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
361 ;;; Hooks from the rest of Emacs
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
362
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
363 (cond
159
3bb7ccffb0c0 Import from CVS: tag r20-3b6
cvs
parents: 134
diff changeset
364 ((string-match "^\\(19\\|20\\)" emacs-version)
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
365 ;; Emacs 19 (Emacs or XEmacs)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
366
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
367 ;; The logical place to put all this code is in generate-new-buffer-name.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
368 ;; It's written in C, so we would add a generate-new-buffer-name-function
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
369 ;; which, if non-nil, would be called instead of the C. One problem with
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
370 ;; that is that generate-new-buffer-name takes a potential buffer name as
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
371 ;; its argument -- not other information, such as what file the buffer will
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
372 ;; visit.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
373
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
374 ;; The below solution works because generate-new-buffer-name is called
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
375 ;; only by rename-buffer (which, as of 19.29, is never called from C) and
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
376 ;; generate-new-buffer, which is called only by Lisp functions
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
377 ;; create-file-buffer and rename-uniquely. Rename-uniquely generally
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
378 ;; isn't used for buffers visiting files, so it's sufficient to hook
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
379 ;; rename-buffer and create-file-buffer. (Setting find-file-hooks isn't
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
380 ;; sufficient.)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
381
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
382 (defadvice rename-buffer (after rename-buffer-uniquify activate)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
383 "Uniquify buffer names with parts of directory name."
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
384 (if (and uniquify-buffer-name-style
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
385 ;; UNIQUE argument
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
386 (ad-get-arg 1))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
387 (progn
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
388 (if uniquify-after-kill-buffer-p
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
389 ;; call with no argument; rationalize vs. old name as well as new
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
390 (uniquify-rationalize-file-buffer-names)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
391 ;; call with argument: rationalize vs. new name only
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
392 (uniquify-rationalize-file-buffer-names
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
393 (uniquify-buffer-file-name (current-buffer)) (current-buffer)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
394 (setq ad-return-value (buffer-name (current-buffer))))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
395
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
396 (defadvice create-file-buffer (after create-file-buffer-uniquify activate)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
397 "Uniquify buffer names with parts of directory name."
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
398 (if uniquify-buffer-name-style
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
399 (uniquify-rationalize-file-buffer-names (ad-get-arg 0) ad-return-value)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
400
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
401 ;; Buffer deletion
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
402 ;; Rerationalize after a buffer is killed, to reduce coinciding buffer names.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
403 ;; This mechanism uses `kill-buffer-hook', which runs *before* deletion.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
404 ;; That means that the kill-buffer-hook function cannot just delete the
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
405 ;; buffer -- it has to set something to do the rationalization *later*.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
406 ;; It actually puts another function on `post-command-hook'. This other
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
407 ;; function runs the rationalization and then removes itself from the hook.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
408 ;; Is there a better way to accomplish this?
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
409 ;; (This ought to set some global variables so the work is done only for
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
410 ;; buffers with names similar to the deleted buffer. -MDE)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
411
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
412 (cond
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
413 ((or (not (string-lessp emacs-version "19.28"))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
414 (and (string-match "XEmacs" emacs-version)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
415 (not (string-lessp emacs-version "19.12"))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
416 ;; Emacs 19.28 or later, or XEmacs (19.12 or later; is that necessary?)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
417 (defun delay-uniquify-rationalize-file-buffer-names ()
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
418 "Add `delayed-uniquify-rationalize-file-buffer-names' to `post-command-hook'.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
419 For use on, eg, `kill-buffer-hook', to rationalize *after* buffer deletion."
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
420 (if (and uniquify-buffer-name-style
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
421 uniquify-after-kill-buffer-p)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
422 (add-hook 'post-command-hook
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
423 'delayed-uniquify-rationalize-file-buffer-names)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
424 (defun delayed-uniquify-rationalize-file-buffer-names ()
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
425 "Rerationalize buffer names and remove self from `post-command-hook'.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
426 See also `delay-rationalize-file-buffer-names' for hook setter."
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
427 (uniquify-rationalize-file-buffer-names)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
428 (remove-hook 'post-command-hook
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
429 'delayed-uniquify-rationalize-file-buffer-names))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
430
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
431 (add-hook 'kill-buffer-hook 'delay-uniquify-rationalize-file-buffer-names))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
432 (t
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
433 ;; GNU Emacs 19.01 through 19.27
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
434 ;; Before version 19.28, {pre,post}-command-hook was unable to set itself.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
435
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
436 (defvar uniquify-post-command-p nil
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
437 "Set to trigger re-rationalization of buffer names by function on
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
438 `post-command-hook'. Used by kill-buffer-rationalization mechanism.")
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
439
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
440 (defun uniquify-post-command-rerationalization ()
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
441 "Set variable so buffer names may be rationalized by `post-command-hook'.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
442
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
443 See variables `uniquify-post-command-p', `uniquify-buffer-name-style', and
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
444 `uniquify-after-kill-buffer-p'."
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
445 (if (and uniquify-buffer-name-style
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
446 uniquify-after-kill-buffer-p)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
447 (setq uniquify-post-command-p
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
448 ;; Set the buffer name, so, once the delimiter character
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
449 ;; is parameterized, we could selectively rationalize just
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
450 ;; related buffer names.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
451 (cons (buffer-name) uniquify-post-command-p))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
452 (defun uniquify-rationalize-after-buffer-kill ()
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
453 "Via `post-command-hook', rerationalize buffer names after kill-buffer.
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
454
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
455 Checks `uniquify-post-command-p', which should be set by
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
456 `uniquify-post-command-rerationalization' function on `kill-buffer-hook'."
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
457 (if uniquify-post-command-p
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
458 (progn (if (and uniquify-buffer-name-style
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
459 uniquify-after-kill-buffer-p)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
460 (uniquify-rationalize-file-buffer-names))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
461 (setq uniquify-post-command-p nil))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
462
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
463 (add-hook 'kill-buffer-hook 'uniquify-post-command-rerationalization)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
464 (add-hook 'post-command-hook 'uniquify-rationalize-after-buffer-kill))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
465 ))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
466 (t
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
467 ;; Emacs 18: redefine create-file-buffer and dired-find-buffer.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
468
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
469 ;; Since advice.el can run in Emacs 18 as well as Emacs 19, we could use
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
470 ;; advice here, too, if it is available; but it's not worth it, since
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
471 ;; Emacs 18 is obsolescent anyway.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
472
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
473 (defun create-file-buffer (filename) ;from files.el
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
474 "Create a suitably named buffer for visiting FILENAME, and return it."
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
475 (let ((base (file-name-nondirectory filename)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
476 (if (string= base "")
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
477 (setq base filename))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
478 (if (and (get-buffer base)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
479 uniquify-ask-about-buffer-names-p)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
480 (get-buffer-create
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
481 (let ((tem (read-string (format
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
482 "Buffer name \"%s\" is in use; type a new name, or Return to clobber: "
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
483 base))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
484 (if (equal tem "") base tem)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
485 (let ((buf (generate-new-buffer base)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
486 (if uniquify-buffer-name-style
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
487 (uniquify-rationalize-file-buffer-names filename buf))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
488 buf))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
489
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
490 (defun dired-find-buffer (dirname) ;from dired.el
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
491 (let ((blist (buffer-list))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
492 found)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
493 (while blist
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
494 (save-excursion
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
495 (set-buffer (car blist))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
496 (if (and (eq major-mode 'dired-mode)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
497 (equal dired-directory dirname))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
498 (setq found (car blist)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
499 blist nil)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
500 (setq blist (cdr blist)))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
501 (or found
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
502 (progn (if (string-match "/$" dirname)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
503 (setq dirname (substring dirname 0 -1)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
504 (create-file-buffer (if uniquify-buffer-name-style
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
505 dirname
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 70
diff changeset
506 (file-name-nondirectory dirname)))))))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
507
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents:
diff changeset
508 ;;; uniquify.el ends here