(occur-1): If the output buffer is also an input, don't kill it, rename it.

2 files changed, 41 insertions, 36 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0daa4d93db..1cdc9ba9cf5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-01  Richard M. Stallman  <rms@gnu.org>
 
+        * replace.el (occur-1): If the output buffer is also an input,
+        don't kill it, rename it.
+
+        * faces.el (set-face-background, set-face-foreground): Doc fix.
+
         * cus-face.el (custom-face-attributes): Fix :help-echo strings
         for :foreground and :background.
 
diff --git a/lisp/replace.el b/lisp/replace.el
index 775ad0ffb05..8820a768006 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -736,9 +736,12 @@ Compatibility function for \\[next-error] invocations."
   (interactive "p")
   ;; we need to run occur-find-match from within the Occur buffer
   (with-current-buffer
+      ;; Choose the buffer and make it current.
       (if (next-error-buffer-p (current-buffer))
           (current-buffer)
-        (next-error-find-buffer nil nil (lambda() (eq major-mode 'occur-mode))))
+        (next-error-find-buffer nil nil
+                                (lambda ()
+                                  (eq major-mode 'occur-mode))))
 
     (goto-char (cond (reset (point-min))
                      ((< argp 0) (line-beginning-position))
@@ -918,17 +921,20 @@ See also `multi-occur'."
 (defun occur-1 (regexp nlines bufs &optional buf-name)
   (unless buf-name
     (setq buf-name "*Occur*"))
-  (let ((occur-buf (get-buffer-create buf-name))
-        (made-temp-buf nil)
+  (let (occur-buf
         (active-bufs (delq nil (mapcar #'(lambda (buf)
                                            (when (buffer-live-p buf) buf))
                                        bufs))))
     ;; Handle the case where one of the buffers we're searching is the
-    ;; *Occur* buffer itself.
-    (when (memq occur-buf bufs)
-      (setq occur-buf (with-current-buffer occur-buf
-                        (clone-buffer "*Occur-temp*"))
-            made-temp-buf t))
+    ;; output buffer.  Just rename it.
+    (when (member buf-name (mapcar 'buffer-name active-bufs))
+      (with-current-buffer (get-buffer buf-name)
+        (rename-uniquely)))
+
+    ;; Now find or create the output buffer.
+    ;; If we just renamed that buffer, we will make a new one here.
+    (setq occur-buf (get-buffer-create buf-name))
+
     (with-current-buffer occur-buf
       (setq buffer-read-only nil)
       (occur-mode)
@@ -948,12 +954,6 @@ See also `multi-occur'."
                    (if (zerop count) "no" (format "%d" count))
                    (if (= count 1) "" "es")
                    regexp))
-        ;; If we had to make a temporary buffer, make it the *Occur*
-        ;; buffer now.
-        (when made-temp-buf
-          (with-current-buffer (get-buffer buf-name)
-            (kill-buffer (current-buffer)))
-          (rename-buffer buf-name))
         (setq occur-revert-arguments (list regexp nlines bufs)
               buffer-read-only t)
         (if (> count 0)
@@ -1258,6 +1258,27 @@ passed in.  If LITERAL is set, no checking is done, anyway."
   (replace-match newtext fixedcase literal)
   noedit)
 
+(defcustom query-replace-highlight t
+  "*Non-nil means to highlight matches during query replacement."
+  :type 'boolean
+  :group 'matching)
+
+(defcustom query-replace-lazy-highlight t
+  "*Controls the lazy-highlighting during query replacements.
+When non-nil, all text in the buffer matching the current match
+is highlighted lazily using isearch lazy highlighting (see
+`isearch-lazy-highlight-initial-delay' and
+`isearch-lazy-highlight-interval')."
+  :type 'boolean
+  :group 'matching
+  :version "21.4")
+
+(defface query-replace
+  '((t (:inherit isearch)))
+  "Face for highlighting query replacement matches."
+  :group 'matching
+  :version "21.4")
+
 (defun perform-replace (from-string replacements
                         query-flag regexp-flag delimited-flag
                         &optional repeat-count map start end)
@@ -1601,27 +1622,6 @@ make, or the user didn't cancel the call."
                  (if (= replace-count 1) "" "s")))
     (and keep-going stack)))
 
-(defcustom query-replace-highlight t
-  "*Non-nil means to highlight matches during query replacement."
-  :type 'boolean
-  :group 'matching)
-
-(defcustom query-replace-lazy-highlight t
-  "*Controls the lazy-highlighting during query replacements.
-When non-nil, all text in the buffer matching the current match
-is highlighted lazily using isearch lazy highlighting (see
-`isearch-lazy-highlight-initial-delay' and
-`isearch-lazy-highlight-interval')."
-  :type 'boolean
-  :group 'matching
-  :version "21.4")
-
-(defface query-replace
-  '((t (:inherit isearch)))
-  "Face for highlighting query replacement matches."
-  :group 'matching
-  :version "21.4")
-
 (defvar replace-overlay nil)
 
 (defun replace-highlight (beg end)
@@ -1638,7 +1638,7 @@ is highlighted lazily using isearch lazy highlighting (see
   (when replace-overlay
     (delete-overlay replace-overlay))
   (when query-replace-lazy-highlight
-    (isearch-lazy-highlight-cleanup isearch-lazy-highlight-cleanup)
+    (isearch-lazy-highlight-cleanup lazy-highlight-cleanup)
     (setq isearch-lazy-highlight-last-string nil)))
 
 ;; arch-tag: 16b4cd61-fd40-497b-b86f-b667c4cf88e4