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