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