# HG changeset patch # User Juanma Barranquero # Date 1120730366 0 # Node ID fe83c61c82daaeddc8b12d771fb3cd32c64d5922 # Parent 0fcb7f3236c9248dcc6ecf84f5a05cd0d1386471 (occur-rename-buffer): Use `generate-new-buffer' also when called non-interactively. Doc fix. diff -r 0fcb7f3236c9 -r fe83c61c82da lisp/replace.el --- a/lisp/replace.el Thu Jul 07 09:36:18 2005 +0000 +++ b/lisp/replace.el Thu Jul 07 09:59:26 2005 +0000 @@ -921,21 +921,22 @@ (when current-prefix-arg (prefix-numeric-value current-prefix-arg)))) -(defun occur-rename-buffer (&optional unique-p) +(defun occur-rename-buffer (&optional unique-p interactive-p) "Rename the current *Occur* buffer to *Occur: original-buffer-name*. -Here `original-buffer-name' is the buffer name were occur was originally run. -When given the prefix argument, the renaming will not clobber the existing -buffer(s) of that name, but use `generate-new-buffer-name' instead. -You can add this to `occur-mode-hook' if you always want a separate *Occur* -buffer for each buffer where you invoke `occur'." - (interactive "P") +Here `original-buffer-name' is the buffer name were Occur was originally run. +When given the prefix argument, or called non-interactively, the renaming +will not clobber the existing buffer(s) of that name, but use +`generate-new-buffer-name' instead. You can add this to `occur-hook' +if you always want a separate *Occur* buffer for each buffer where you +invoke `occur'." + (interactive "P\np") (with-current-buffer (if (eq major-mode 'occur-mode) (current-buffer) (get-buffer "*Occur*")) (rename-buffer (concat "*Occur: " (mapconcat #'buffer-name (car (cddr occur-revert-arguments)) "/") "*") - unique-p))) + (or unique-p (not interactive-p))))) (defun occur (regexp &optional nlines) "Show all lines in the current buffer containing a match for REGEXP.