* emacs-lisp/byte-run.el (defmacro): Use same argument parsing as
[bpt/emacs.git] / lisp / uniquify.el
CommitLineData
ba83908c 1;;; uniquify.el --- unique buffer names dependent on file name -*- lexical-binding: t -*-
4c61f92c 2
acaf905b 3;; Copyright (C) 1989, 1995-1997, 2001-2012 Free Software Foundation, Inc.
4c61f92c
KH
4
5;; Author: Dick King <king@reasoning.com>
2ad02767 6;; Maintainer: FSF
284b3043 7;; Keywords: files
4c61f92c 8;; Created: 15 May 86
bd78fa1d 9;; Package: emacs
4c61f92c
KH
10
11;; This file is part of GNU Emacs.
12
eb3fa2cf 13;; GNU Emacs is free software: you can redistribute it and/or modify
4c61f92c 14;; it under the terms of the GNU General Public License as published by
eb3fa2cf
GM
15;; the Free Software Foundation, either version 3 of the License, or
16;; (at your option) any later version.
4c61f92c
KH
17
18;; GNU Emacs is distributed in the hope that it will be useful,
19;; but WITHOUT ANY WARRANTY; without even the implied warranty of
20;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21;; GNU General Public License for more details.
22
23;; You should have received a copy of the GNU General Public License
eb3fa2cf 24;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
4c61f92c
KH
25
26;;; Commentary:
27
28;; Emacs's standard method for making buffer names unique adds <2>, <3>,
20c4d633 29;; etc. to the end of (all but one of) the buffers. This file replaces
4c61f92c 30;; that behavior, for buffers visiting files and dired buffers, with a
5246db4e 31;; uniquification that adds parts of the file name until the buffer names
4c61f92c
KH
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
4219b27b
RS
37;; To use this file, do (require 'uniquify)
38;; and set uniquify-buffer-name-style to one of its non-nil alternative values.
39
4c61f92c
KH
40;; For other options, see "User-visible variables", below.
41
d7993a1c
RS
42;; A version of uniquify.el that works under Emacs 18, Emacs 19, XEmacs,
43;; and InfoDock is available from the maintainer.
4c61f92c
KH
44
45;;; Change Log:
46
47;; Originally by Dick King <king@reasoning.com> 15 May 86
feeb94f7 48;; Converted for Emacs 18 by Stephen Gildea <gildea@stop.mail-abuse.org>
4c61f92c
KH
49;; Make uniquify-min-dir-content 0 truly non-invasive. gildea 23 May 89
50;; Some cleanup. uniquify-min-dir-content default 0. gildea 01 Jun 89
51;; Don't rename to "". Michael Ernst <mernst@theory.lcs.mit.edu> 15 Jun 94
52;; Add kill-buffer-hook. Kenneth Manheimer <ken.manheimer@nist.gov> 09 May 95
53;; Add advice for rename-buffer and create-file-buffer, handle dired buffers,
54;; kill-buffer-rationalize-buffer-names-p, documentation. mernst 24 May 95
55;; Remove free variables, fix typos. mernst 5 Jun 95
56;; Efficiently support Emacs 19.27 & earlier. ken.manheimer, mernst 10 Jun 95
57;; Rename user options to "uniquify-...", add uniquify-reverse-dir-content-p,
58;; add uniquify-ask-about-buffer-names-p. king, mernst 13 Jun 95
59;; Prefix functions by "uniquify-..."; rename mnemonic-buffer-names to
60;; uniquify-buffer-name-style; add 'forward and 'post-forward-angle-brackets
61;; styles; remove uniquify-reverse-dir-content-p; add
62;; uniquify-trailing-separator-p. mernst 4 Aug 95
bc2e0aae
KH
63;; Don't call expand-file-name on nil. mernst 7 Jan 96
64;; Check whether list-buffers-directory is bound. mernst 11 Oct 96
65;; Ignore non-file non-dired buffers. Colin Rafferty <craffert@ml.com> 3 Mar 97
4ddd2beb
RS
66;; Use last component, not "", for file name of directories. mernst 27 Jun 97
67;; Use directory-file-name; code cleanup. mernst 6 Sep 97
9a9c6f9f
RS
68;; Add uniquify-ignore-buffers-re.
69;; Andre Srinivasan <andre@visigenic.com> 9 Sep 97
f4eda05f
SM
70;; Add uniquify-list-buffers-directory-modes
71;; Stefan Monnier <monnier@cs.yale.edu> 17 Nov 2000
4126f5b7 72;; Algorithm and data structure changed to reduce consing with lots of buffers
ef9f9d30 73;; Francesco Potortì <pot@gnu.org> (ideas by rms and monnier) 2001-07-18
4c61f92c
KH
74
75;; Valuable feedback was provided by
76;; Paul Smith <psmith@baynetworks.com>,
77;; Alastair Burt <burt@dfki.uni-kl.de>,
78;; Bob Weiner <weiner@footloose.sps.mot.com>,
79;; Albert L. Ting <alt@vlibs.com>,
bc2e0aae
KH
80;; gyro@reasoning.com,
81;; Bryan O'Sullivan <bos@eng.sun.com>.
4c61f92c
KH
82
83
84;;; Code:
85
f58e0fd5 86(eval-when-compile (require 'cl-lib))
4c61f92c
KH
87
88;;; User-visible variables
89
c5292bc8 90(defgroup uniquify nil
0c4eeda3 91 "Unique buffer names dependent on file name."
eba5b4dd 92 :group 'files)
c5292bc8
RS
93
94
4219b27b 95(defcustom uniquify-buffer-name-style nil
e725d58f 96 "If non-nil, buffer names are uniquified with parts of directory name.
5246db4e 97The value determines the buffer name style and is one of `forward',
595ded73 98`reverse', `post-forward', or `post-forward-angle-brackets'.
5246db4e
KH
99For example, files `/foo/bar/mumble/name' and `/baz/quux/mumble/name'
100would have the following buffer names in the various styles:
4c61f92c
KH
101 forward bar/mumble/name quux/mumble/name
102 reverse name\\mumble\\bar name\\mumble\\quux
103 post-forward name|bar/mumble name|quux/mumble
104 post-forward-angle-brackets name<bar/mumble> name<quux/mumble>
e725d58f
SM
105 nil name name<2>
106Of course, the \"mumble\" part may be stripped as well, depending on the setting
107of `uniquify-strip-common-suffix'."
c5292bc8
RS
108 :type '(radio (const forward)
109 (const reverse)
110 (const post-forward)
4f5074c1 111 (const post-forward-angle-brackets)
4219b27b 112 (const :tag "standard Emacs behavior (nil)" nil))
f5307782
JB
113 :require 'uniquify
114 :group 'uniquify)
c5292bc8 115
dee9b44f 116(defcustom uniquify-after-kill-buffer-p t
c3c140d6 117 "If non-nil, rerationalize buffer names after a buffer has been killed."
f5307782
JB
118 :type 'boolean
119 :group 'uniquify)
4c61f92c 120
c5292bc8 121(defcustom uniquify-ask-about-buffer-names-p nil
e725d58f 122 "If non-nil, permit user to choose names for buffers with same base file.
4c61f92c 123If the user chooses to name a buffer, uniquification is preempted and no
c5292bc8 124other buffer names are changed."
f5307782
JB
125 :type 'boolean
126 :group 'uniquify)
4c61f92c 127
1f9d00ca 128;; The default value matches certain Gnus buffers.
dee9b44f 129(defcustom uniquify-ignore-buffers-re nil
e725d58f 130 "Regular expression matching buffer names that should not be uniquified.
9a9c6f9f
RS
131For instance, set this to \"^draft-[0-9]+$\" to avoid having uniquify rename
132draft buffers even if `uniquify-after-kill-buffer-p' is non-nil and the
133visited file name isn't the same as that of the buffer."
f5307782
JB
134 :type '(choice (const :tag "Uniquify all buffers" nil) regexp)
135 :group 'uniquify)
9a9c6f9f 136
c5292bc8 137(defcustom uniquify-min-dir-content 0
e725d58f 138 "Minimum number of directory name components included in buffer name."
f5307782
JB
139 :type 'integer
140 :group 'uniquify)
4c61f92c 141
c5292bc8 142(defcustom uniquify-separator nil
e725d58f 143 "String separator for buffer name components.
5246db4e 144When `uniquify-buffer-name-style' is `post-forward', separates
4c61f92c 145base file name from directory part in buffer names (default \"|\").
5246db4e 146When `uniquify-buffer-name-style' is `reverse', separates all
c5292bc8 147file name components (default \"\\\")."
f5307782
JB
148 :type '(choice (const nil) string)
149 :group 'uniquify)
4c61f92c 150
c5292bc8 151(defcustom uniquify-trailing-separator-p nil
e725d58f 152 "If non-nil, add a file name separator to dired buffer names.
5246db4e
KH
153If `uniquify-buffer-name-style' is `forward', add the separator at the end;
154if it is `reverse', add the separator at the beginning; otherwise, this
c5292bc8 155variable is ignored."
f5307782
JB
156 :type 'boolean
157 :group 'uniquify)
4c61f92c 158
c3c140d6
SM
159(defcustom uniquify-strip-common-suffix
160 ;; Using it when uniquify-min-dir-content>0 doesn't make much sense.
161 (eq 0 uniquify-min-dir-content)
162 "If non-nil, strip common directory suffixes of conflicting files.
163E.g. if you open /a1/b/c/d and /a2/b/c/d, the buffer names will say
164\"d|a1\" and \"d|a2\" instead of \"d|a1/b/c\" and \"d|a2/b/c\".
165This can be handy when you have deep parallel hierarchies."
f5307782
JB
166 :type 'boolean
167 :group 'uniquify)
c3c140d6 168
76dc97b8 169(defvar uniquify-list-buffers-directory-modes '(dired-mode cvs-mode vc-dir-mode)
f4eda05f
SM
170 "List of modes for which uniquify should obey `list-buffers-directory'.
171That means that when `buffer-file-name' is set to nil, `list-buffers-directory'
172contains the name of the directory which the buffer is visiting.")
4c61f92c
KH
173
174;;; Utilities
175
4ddd2beb 176;; uniquify-fix-list data structure
f58e0fd5 177(cl-defstruct (uniquify-item
df050870 178 (:constructor nil) (:copier nil)
c3c140d6
SM
179 (:constructor uniquify-make-item
180 (base dirname buffer &optional proposed)))
bf0e40d4 181 base dirname buffer proposed)
4c61f92c
KH
182
183;; Internal variables used free
4c61f92c
KH
184(defvar uniquify-possibly-resolvable nil)
185
6b09e9c8 186(defvar uniquify-managed nil
518e35e6
SM
187 "Non-nil if the name of this buffer is managed by uniquify.
188It actually holds the list of `uniquify-item's corresponding to the conflict.")
6b09e9c8
SM
189(make-variable-buffer-local 'uniquify-managed)
190(put 'uniquify-managed 'permanent-local t)
191
20c4d633
JB
192;; Used in desktop.el to save the non-uniquified buffer name
193(defun uniquify-buffer-base-name ()
194 "Return the base name of the current buffer.
ef9f9d30 195Return nil if the buffer is not managed by uniquify."
20c4d633 196 (and uniquify-managed
ef9f9d30 197 (uniquify-item-base (car uniquify-managed))))
20c4d633 198
4c61f92c
KH
199;;; Main entry point.
200
75e2fcb6 201(defun uniquify-rationalize-file-buffer-names (base dirname newbuf)
f4eda05f 202 "Make file buffer names unique by adding segments from file name.
4c61f92c 203If `uniquify-min-dir-content' > 0, always pulls that many
124e448b 204file name elements.
aa744995 205Arguments BASE, DIRNAME, and NEWBUF specify the new buffer that causes
2eec3e8e
SM
206this rationalization."
207 (interactive
208 (list (if uniquify-managed
209 (uniquify-item-base (car uniquify-managed)) (buffer-name))
210 (uniquify-buffer-file-name (current-buffer))
211 (current-buffer)))
9890ec7d
SM
212 ;; Make sure we don't get confused by outdated uniquify-managed info in
213 ;; this buffer.
214 (with-current-buffer newbuf (setq uniquify-managed nil))
215 (when dirname
75e2fcb6
SM
216 (setq dirname (expand-file-name (directory-file-name dirname)))
217 (let ((fix-list (list (uniquify-make-item base dirname newbuf)))
218 items)
ad599c11 219 (dolist (buffer (buffer-list))
75e2fcb6
SM
220 (when (and (not (and uniquify-ignore-buffers-re
221 (string-match uniquify-ignore-buffers-re
222 (buffer-name buffer))))
223 ;; Only try to rename buffers we actually manage.
224 (setq items (buffer-local-value 'uniquify-managed buffer))
225 (equal base (uniquify-item-base (car items)))
226 ;; Don't re-add stuff we already have. Actually this
227 ;; whole `and' test should only match at most once.
228 (not (memq (car items) fix-list)))
aa744995
SM
229 (unless (cdr items)
230 ;; If there was no conflict, the buffer-name is equal to the
231 ;; base-name and we may have missed a rename-buffer because
232 ;; of code like in set-visited-file-name:
233 ;; (or (string= new-name (buffer-name)) (rename-buffer new-name t))
234 ;; So we need to refresh the dirname of the uniquify-item.
235 (setf (uniquify-item-dirname (car items))
236 (uniquify-buffer-file-name
237 (uniquify-item-buffer (car items))))
dee9b44f 238 ;; This shouldn't happen, but maybe there's no dirname any more.
aa744995 239 (unless (uniquify-item-dirname (car items))
aa744995 240 (with-current-buffer (uniquify-item-buffer (car items))
1c4001a1
SM
241 (setq uniquify-managed nil))
242 (setq items nil)))
8837a213
SM
243 ;; In case we missed some calls to kill-buffer, there may be dead
244 ;; buffers in uniquify-managed, so filter them out.
245 (setq items
246 (delq nil (mapcar
247 (lambda (item)
248 (if (buffer-live-p (uniquify-item-buffer item))
249 item))
250 items)))
75e2fcb6 251 (setq fix-list (append fix-list items))))
ad599c11
SM
252 ;; selects buffers whose names may need changing, and others that
253 ;; may conflict, then bring conflicting names together
254 (uniquify-rationalize fix-list))))
4c61f92c 255
4ddd2beb 256;; uniquify's version of buffer-file-name; result never contains trailing slash
4c61f92c 257(defun uniquify-buffer-file-name (buffer)
75e2fcb6 258 "Return name of directory, file BUFFER is visiting, or nil if none.
f4eda05f
SM
259Works on ordinary file-visiting buffers and buffers whose mode is mentioned
260in `uniquify-list-buffers-directory-modes', otherwise returns nil."
75e2fcb6
SM
261 (with-current-buffer buffer
262 (let ((filename
263 (or buffer-file-name
264 (if (memq major-mode uniquify-list-buffers-directory-modes)
265 list-buffers-directory))))
266 (when filename
aa744995
SM
267 (directory-file-name
268 (file-name-directory
269 (expand-file-name
270 (directory-file-name filename))))))))
4c61f92c 271
518e35e6 272(defun uniquify-rerationalize-w/o-cb (fix-list)
e725d58f 273 "Re-rationalize the buffers in FIX-LIST, but ignoring `current-buffer'."
518e35e6
SM
274 (let ((new-fix-list nil))
275 (dolist (item fix-list)
276 (let ((buf (uniquify-item-buffer item)))
277 (unless (or (eq buf (current-buffer)) (not (buffer-live-p buf)))
518e35e6
SM
278 (push item new-fix-list))))
279 (when new-fix-list
280 (uniquify-rationalize new-fix-list))))
281
282(defun uniquify-rationalize (fix-list)
283 ;; Set up uniquify to re-rationalize after killing/renaming
284 ;; if there is a conflict.
c3c140d6
SM
285 (dolist (item fix-list)
286 (with-current-buffer (uniquify-item-buffer item)
aa744995 287 ;; Refresh the dirnames and proposed names.
c3c140d6
SM
288 (setf (uniquify-item-proposed item)
289 (uniquify-get-proposed-name (uniquify-item-base item)
290 (uniquify-item-dirname item)))
518e35e6 291 (setq uniquify-managed fix-list)))
c3c140d6
SM
292 ;; Strip any shared last directory names of the dirname.
293 (when (and (cdr fix-list) uniquify-strip-common-suffix)
294 (let ((strip t))
295 (while (let* ((base (file-name-nondirectory
296 (uniquify-item-dirname (car fix-list))))
297 (items fix-list))
298 (when (> (length base) 0)
299 (while (and strip items)
300 (unless (equal base (file-name-nondirectory
301 (uniquify-item-dirname (pop items))))
302 (setq strip nil)))
303 strip))
304 ;; It's all the same => strip.
305 (dolist (item (prog1 fix-list (setq fix-list nil)))
306 ;; Create new items because the old ones are kept (with the true
307 ;; `dirname') for later rerationalizing.
308 (push (uniquify-make-item (uniquify-item-base item)
309 (let ((f (file-name-directory
310 (uniquify-item-dirname item))))
311 (and f (directory-file-name f)))
312 (uniquify-item-buffer item)
313 (uniquify-item-proposed item))
314 fix-list)))))
518e35e6
SM
315 ;; If uniquify-min-dir-content is 0, this will end up just
316 ;; passing fix-list to uniquify-rationalize-conflicting-sublist.
317 (uniquify-rationalize-a-list fix-list))
318
57749acf 319(defun uniquify-item-greaterp (item1 item2)
df050870
SM
320 (string-lessp (uniquify-item-proposed item2)
321 (uniquify-item-proposed item1)))
4c61f92c 322
df050870
SM
323(defun uniquify-rationalize-a-list (fix-list &optional depth)
324 (unless depth (setq depth uniquify-min-dir-content))
18ed17e4 325 (let (conflicting-sublist ; all elements have the same proposed name
4126f5b7
FP
326 (old-proposed "")
327 proposed)
df050870
SM
328 ;; Divide fix-list into items with same proposed names and pass them
329 ;; to uniquify-rationalize-conflicting-sublist.
3e9db557 330 (dolist (item (sort (copy-sequence fix-list) 'uniquify-item-greaterp))
df050870 331 (setq proposed (uniquify-item-proposed item))
4126f5b7 332 (unless (equal proposed old-proposed)
b2f1b848 333 (uniquify-rationalize-conflicting-sublist conflicting-sublist
4126f5b7 334 old-proposed depth)
b2f1b848
FP
335 (setq conflicting-sublist nil))
336 (push item conflicting-sublist)
4126f5b7
FP
337 (setq old-proposed proposed))
338 (uniquify-rationalize-conflicting-sublist conflicting-sublist
339 old-proposed depth)))
4c61f92c 340
bf0e40d4 341(defun uniquify-get-proposed-name (base dirname &optional depth)
df050870 342 (unless depth (setq depth uniquify-min-dir-content))
f58e0fd5 343 (cl-assert (equal (directory-file-name dirname) dirname)) ;No trailing slash.
1c549bbe
GM
344
345 ;; Distinguish directories by adding extra separator.
346 (if (and uniquify-trailing-separator-p
bf0e40d4 347 (file-directory-p (expand-file-name base dirname))
1c549bbe
GM
348 (not (string-equal base "")))
349 (cond ((eq uniquify-buffer-name-style 'forward)
350 (setq base (file-name-as-directory base)))
351 ;; (setq base (concat base "/")))
352 ((eq uniquify-buffer-name-style 'reverse)
353 (setq base (concat (or uniquify-separator "\\") base)))))
354
355 (let ((extra-string nil)
b2f1b848 356 (n depth))
bf0e40d4
SM
357 (while (and (> n 0) dirname)
358 (let ((file (file-name-nondirectory dirname)))
359 (when (setq dirname (file-name-directory dirname))
360 (setq dirname (directory-file-name dirname)))
1c549bbe
GM
361 (setq n (1- n))
362 (push (if (zerop (length file)) ;nil or "".
b8206d82
MA
363 (prog1 (or (file-remote-p dirname) "")
364 (setq dirname nil)) ;Could be `dirname' iso "".
1c549bbe
GM
365 file)
366 extra-string)))
367 (when (zerop n)
bf0e40d4
SM
368 (if (and dirname extra-string
369 (equal dirname (file-name-directory dirname)))
1c549bbe
GM
370 ;; We're just before the root. Let's add the leading / already.
371 ;; With "/a/b"+"/c/d/b" this leads to "/a/b" and "d/b" but with
372 ;; "/a/b"+"/c/a/b" this leads to "/a/b" and "a/b".
373 (push "" extra-string))
374 (setq uniquify-possibly-resolvable t))
375
376 (cond
377 ((null extra-string) base)
378 ((string-equal base "") ;Happens for dired buffers on the root directory.
5da10d40 379 (mapconcat 'identity extra-string "/"))
1c549bbe 380 ((eq uniquify-buffer-name-style 'reverse)
5da10d40
RS
381 (mapconcat 'identity
382 (cons base (nreverse extra-string))
383 (or uniquify-separator "\\")))
1c549bbe
GM
384 ((eq uniquify-buffer-name-style 'forward)
385 (mapconcat 'identity (nconc extra-string (list base))
5da10d40 386 "/"))
1c549bbe
GM
387 ((eq uniquify-buffer-name-style 'post-forward)
388 (concat base (or uniquify-separator "|")
5da10d40 389 (mapconcat 'identity extra-string "/")))
1c549bbe 390 ((eq uniquify-buffer-name-style 'post-forward-angle-brackets)
5da10d40
RS
391 (concat base "<" (mapconcat 'identity extra-string "/")
392 ">"))
1c549bbe
GM
393 (t (error "Bad value for uniquify-buffer-name-style: %s"
394 uniquify-buffer-name-style)))))
4c61f92c
KH
395
396
4ddd2beb
RS
397;; Deal with conflicting-sublist, all of whose elements have identical
398;; "base" components.
57749acf
FP
399(defun uniquify-rationalize-conflicting-sublist (conf-list old-name depth)
400 (when conf-list
401 (if (or (cdr conf-list)
df050870
SM
402 ;; Check that the proposed name doesn't conflict with some
403 ;; existing buffer.
404 (let ((buf (get-buffer old-name)))
405 (and buf (not (eq buf (uniquify-item-buffer (car conf-list)))))))
57749acf
FP
406 (when uniquify-possibly-resolvable
407 (setq uniquify-possibly-resolvable nil
408 depth (1+ depth))
409 (dolist (item conf-list)
df050870
SM
410 (setf (uniquify-item-proposed item)
411 (uniquify-get-proposed-name
412 (uniquify-item-base item)
bf0e40d4 413 (uniquify-item-dirname item)
df050870 414 depth)))
57749acf
FP
415 (uniquify-rationalize-a-list conf-list depth))
416 (unless (string= old-name "")
417 (uniquify-rename-buffer (car conf-list) old-name)))))
418
4c61f92c
KH
419
420(defun uniquify-rename-buffer (item newname)
df050870 421 (let ((buffer (uniquify-item-buffer item)))
4126f5b7 422 (unless (equal newname (buffer-name buffer))
df050870
SM
423 (with-current-buffer buffer
424 (let ((uniquify-buffer-name-style nil)) ;Avoid hooks on rename-buffer.
6b09e9c8 425 ;; Pass the `unique' arg, so the advice doesn't mark it as unmanaged.
df050870 426 (rename-buffer newname t))))))
4c61f92c 427
4c61f92c
KH
428;;; Hooks from the rest of Emacs
429
43ae2c48
GM
430(defun uniquify-maybe-rerationalize-w/o-cb ()
431 "Re-rationalize buffer names, ignoring current buffer."
432 (and (cdr uniquify-managed)
433 uniquify-buffer-name-style
434 (uniquify-rerationalize-w/o-cb uniquify-managed)))
435
58be68a8
JB
436;; Buffer deletion
437;; Rerationalize after a buffer is killed, to reduce coinciding buffer names.
438;; This mechanism uses `kill-buffer-hook', which runs *before* deletion, so
439;; it calls `uniquify-rerationalize-w/o-cb' to rerationalize the buffer list
440;; ignoring the current buffer (which is going to be deleted anyway).
43ae2c48 441(defun uniquify-kill-buffer-function ()
58be68a8
JB
442 "Re-rationalize buffer names, ignoring current buffer.
443For use on `kill-buffer-hook'."
43ae2c48
GM
444 (and uniquify-after-kill-buffer-p
445 (uniquify-maybe-rerationalize-w/o-cb)))
58be68a8
JB
446
447;; Ideally we'd like to add it buffer-locally, but that doesn't work
448;; because kill-buffer-hook is not permanent-local :-(
43ae2c48
GM
449;; FIXME kill-buffer-hook _is_ permanent-local in 22+.
450(add-hook 'kill-buffer-hook 'uniquify-kill-buffer-function)
58be68a8 451
4c61f92c
KH
452;; The logical place to put all this code is in generate-new-buffer-name.
453;; It's written in C, so we would add a generate-new-buffer-name-function
454;; which, if non-nil, would be called instead of the C. One problem with
455;; that is that generate-new-buffer-name takes a potential buffer name as
456;; its argument -- not other information, such as what file the buffer will
457;; visit.
458
459;; The below solution works because generate-new-buffer-name is called
460;; only by rename-buffer (which, as of 19.29, is never called from C) and
461;; generate-new-buffer, which is called only by Lisp functions
462;; create-file-buffer and rename-uniquely. Rename-uniquely generally
463;; isn't used for buffers visiting files, so it's sufficient to hook
1a4914f3 464;; rename-buffer and create-file-buffer. (Setting find-file-hook isn't
4c61f92c
KH
465;; sufficient.)
466
467(defadvice rename-buffer (after rename-buffer-uniquify activate)
468 "Uniquify buffer names with parts of directory name."
518e35e6 469 (uniquify-maybe-rerationalize-w/o-cb)
6b09e9c8
SM
470 (if (null (ad-get-arg 1)) ; no UNIQUE argument.
471 ;; Mark this buffer so it won't be renamed by uniquify.
472 (setq uniquify-managed nil)
473 (when uniquify-buffer-name-style
518e35e6
SM
474 ;; Rerationalize w.r.t the new name.
475 (uniquify-rationalize-file-buffer-names
75e2fcb6
SM
476 (ad-get-arg 0)
477 (uniquify-buffer-file-name (current-buffer))
478 (current-buffer))
6b09e9c8 479 (setq ad-return-value (buffer-name (current-buffer))))))
4c61f92c
KH
480
481(defadvice create-file-buffer (after create-file-buffer-uniquify activate)
482 "Uniquify buffer names with parts of directory name."
483 (if uniquify-buffer-name-style
75e2fcb6
SM
484 (let ((filename (expand-file-name (directory-file-name (ad-get-arg 0)))))
485 (uniquify-rationalize-file-buffer-names
486 (file-name-nondirectory filename)
487 (file-name-directory filename) ad-return-value))))
4c61f92c 488
2513e3fd
JB
489;;; The End
490
491(defun uniquify-unload-function ()
352ddc78 492 "Unload the uniquify library."
2513e3fd
JB
493 (save-current-buffer
494 (let ((buffers nil))
495 (dolist (buf (buffer-list))
496 (set-buffer buf)
497 (when uniquify-managed
498 (push (cons buf (uniquify-item-base (car uniquify-managed))) buffers)))
499 (dolist (fun '(rename-buffer create-file-buffer))
500 (ad-remove-advice fun 'after (intern (concat (symbol-name fun) "-uniquify")))
501 (ad-update fun))
502 (dolist (buf buffers)
503 (set-buffer (car buf))
504 (rename-buffer (cdr buf) t))))
20c4d633 505 ;; continue standard unloading
2513e3fd 506 nil)
8b374c3f 507
df050870 508(provide 'uniquify)
ab5796a9 509
4c61f92c 510;;; uniquify.el ends here