andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.

Browse source
This commit is contained in:
Stefan Monnier 2005-01-05 21:20:38 +00:00
parent 4dbbcb46d9
commit 2eec3e8edf
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2005-01-05 Stefan Monnier <monnier@iro.umontreal.ca>
* uniquify.el (uniquify-rationalize-file-buffer-names):
Re-add an interactive spec.
* isearch.el (isearch-dehighlight): Remove unused arg `totally'.
(isearch-update, isearch-done): Adjust calls accordingly.

12
lisp/uniquify.el
View file

@ -1,6 +1,7 @@
;;; uniquify.el --- unique buffer names dependent on file name
;; Copyright (c) 1989,95,96,97,2001,2003 Free Software Foundation, Inc.
;; Copyright (c) 1989, 1995, 1996, 1997, 2001, 2003, 2005
;; Free Software Foundation, Inc.
;; Author: Dick King <king@reasoning.com>
;; Maintainer: FSF
@ -187,7 +188,12 @@ It actually holds the list of `uniquify-item's corresponding to the conflict.")
If `uniquify-min-dir-content' > 0, always pulls that many
file name elements.
Arguments BASE, DIRNAME, and NEWBUF specify the new buffer that causes
this rationaliztion."
this rationalization."
(interactive
(list (if uniquify-managed
(uniquify-item-base (car uniquify-managed)) (buffer-name))
(uniquify-buffer-file-name (current-buffer))
(current-buffer)))
(if (null dirname)
(with-current-buffer newbuf (setq uniquify-managed nil))
(setq dirname (expand-file-name (directory-file-name dirname)))
@ -457,5 +463,5 @@ For use on `kill-buffer-hook'."
(provide 'uniquify)
;;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065
;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065
;;; uniquify.el ends here