diff options
| author | Stefan Monnier | 2005-01-05 21:20:38 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2005-01-05 21:20:38 +0000 |
| commit | 2eec3e8edf086e6a89f81fa1591d9f25b0bc3344 (patch) | |
| tree | ce8daf9445f8be70ba00b2cceeab2b785607ad84 | |
| parent | 4dbbcb46d91862a16b21651e0b95e5959ffdbfb8 (diff) | |
| download | emacs-2eec3e8edf086e6a89f81fa1591d9f25b0bc3344.tar.gz emacs-2eec3e8edf086e6a89f81fa1591d9f25b0bc3344.zip | |
(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 @@ | |||
| 1 | 2005-01-05 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2005-01-05 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * uniquify.el (uniquify-rationalize-file-buffer-names): | ||
| 4 | Re-add an interactive spec. | ||
| 5 | |||
| 3 | * isearch.el (isearch-dehighlight): Remove unused arg `totally'. | 6 | * isearch.el (isearch-dehighlight): Remove unused arg `totally'. |
| 4 | (isearch-update, isearch-done): Adjust calls accordingly. | 7 | (isearch-update, isearch-done): Adjust calls accordingly. |
| 5 | 8 | ||
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 @@ | |||
| 1 | ;;; uniquify.el --- unique buffer names dependent on file name | 1 | ;;; uniquify.el --- unique buffer names dependent on file name |
| 2 | 2 | ||
| 3 | ;; Copyright (c) 1989,95,96,97,2001,2003 Free Software Foundation, Inc. | 3 | ;; Copyright (c) 1989, 1995, 1996, 1997, 2001, 2003, 2005 |
| 4 | ;; Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | ;; Author: Dick King <king@reasoning.com> | 6 | ;; Author: Dick King <king@reasoning.com> |
| 6 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
| @@ -187,7 +188,12 @@ It actually holds the list of `uniquify-item's corresponding to the conflict.") | |||
| 187 | If `uniquify-min-dir-content' > 0, always pulls that many | 188 | If `uniquify-min-dir-content' > 0, always pulls that many |
| 188 | file name elements. | 189 | file name elements. |
| 189 | Arguments BASE, DIRNAME, and NEWBUF specify the new buffer that causes | 190 | Arguments BASE, DIRNAME, and NEWBUF specify the new buffer that causes |
| 190 | this rationaliztion." | 191 | this rationalization." |
| 192 | (interactive | ||
| 193 | (list (if uniquify-managed | ||
| 194 | (uniquify-item-base (car uniquify-managed)) (buffer-name)) | ||
| 195 | (uniquify-buffer-file-name (current-buffer)) | ||
| 196 | (current-buffer))) | ||
| 191 | (if (null dirname) | 197 | (if (null dirname) |
| 192 | (with-current-buffer newbuf (setq uniquify-managed nil)) | 198 | (with-current-buffer newbuf (setq uniquify-managed nil)) |
| 193 | (setq dirname (expand-file-name (directory-file-name dirname))) | 199 | (setq dirname (expand-file-name (directory-file-name dirname))) |
| @@ -457,5 +463,5 @@ For use on `kill-buffer-hook'." | |||
| 457 | 463 | ||
| 458 | (provide 'uniquify) | 464 | (provide 'uniquify) |
| 459 | 465 | ||
| 460 | ;;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065 | 466 | ;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065 |
| 461 | ;;; uniquify.el ends here | 467 | ;;; uniquify.el ends here |