Unbreak 'revert-buffer' in Occur buffers

* lisp/replace.el (occur-revert-function): Use the value of
occur-revert-function from the correct buffer.  (Bug#32987)

* test/lisp/replace-tests.el (replace-occur-revert-bug32543)
(replace-occur-revert-bug32987): New tests.

1 files changed, 8 insertions, 8 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 00b2ceee356..04e5d4273e0 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1226,14 +1226,14 @@ the user called `occur'."
     (pcase-let ((`(,region-start ,region-end ,orig-line ,buffer)
                  (occur--parse-occur-buffer))
                 (regexp (car occur-revert-arguments)))
-      (with-current-buffer buffer
-        (when (wholenump orig-line)
-          (goto-char (point-min))
-          (forward-line (1- orig-line)))
-        (save-excursion
-          (if (or region-start region-end)
-              (occur regexp nil (list (cons region-start region-end)))
-            (apply 'occur-1 (append occur-revert-arguments (list (buffer-name))))))))))
+      (if (not (or region-start region-end))
+          (apply 'occur-1 (append occur-revert-arguments (list (buffer-name))))
+        (with-current-buffer buffer
+          (when (wholenump orig-line)
+            (goto-char (point-min))
+            (forward-line (1- orig-line)))
+          (save-excursion
+            (occur regexp nil (list (cons region-start region-end)))))))))
 
 (defun occur-mode-find-occurrence ()
   (let ((pos (get-text-property (point) 'occur-target)))