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