diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-01-05 21:20:38 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-01-05 21:20:38 +0000 |
| commit | 2eec3e8edf086e6a89f81fa1591d9f25b0bc3344 (patch) | |
| tree | ce8daf9445f8be70ba00b2cceeab2b785607ad84 | |
| parent | 4dbbcb46d91862a16b21651e0b95e5959ffdbfb8 (diff) | |
| download | emacs-2eec3e8edf086e6a89f81fa1591d9f25b0bc3344.tar.gz | |
(uniquify-rationalize-file-buffer-names): Re-add an interactive spec.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/uniquify.el | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3a0a9aa31b..a7f548cf0b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/uniquify.el b/lisp/uniquify.el index b2da7971167..689dffb9618 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -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 |