emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 262f5c8: Revert part of last commit


From: Eli Zaretskii
Subject: [Emacs-diffs] master 262f5c8: Revert part of last commit
Date: Tue, 9 Oct 2018 10:55:50 -0400 (EDT)

branch: master
commit 262f5c809913a232a931131d040964cbdf4ac6f9
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Revert part of last commit
    
    * lisp/replace.el (occur-revert-function): Revert last change,
    as it's no longer needed.  (Bug#32987)
---
 lisp/replace.el | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/lisp/replace.el b/lisp/replace.el
index 7d31384..a134e4e 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1207,19 +1207,7 @@ To return to ordinary Occur mode, use 
\\[occur-cease-edit]."
 
 (defun occur-revert-function (_ignore1 _ignore2)
   "Handle `revert-buffer' for Occur mode buffers."
-  (if (cdr (nth 2 occur-revert-arguments)) ; multi-occur
-      (apply 'occur-1 (append occur-revert-arguments (list (buffer-name))))
-    (pcase-let ((`(,region-start ,region-end ,orig-line ,buffer)
-                 (occur--parse-occur-buffer))
-                (regexp (car occur-revert-arguments)))
-      (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)))))))))
+  (apply #'occur-1 (append occur-revert-arguments (list (buffer-name)))))
 
 (defun occur-mode-find-occurrence ()
   (let ((pos (get-text-property (point) 'occur-target)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]