emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] master b894874 309/348: ivy.el (ivy-occur-grep-mode): Call wgrep-


From: Oleh Krehel
Subject: [elpa] master b894874 309/348: ivy.el (ivy-occur-grep-mode): Call wgrep-setup if available
Date: Sat, 8 Apr 2017 11:04:20 -0400 (EDT)

branch: master
commit b8948744176bb423cafbc0fd9f185dc101b4371e
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    ivy.el (ivy-occur-grep-mode): Call wgrep-setup if available
    
    * ivy.el (ivy-occur-revert-buffer): Call `wgrep-setup', through
      `ivy-occur-grep-mode'.
    
    Re #904
---
 ivy.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ivy.el b/ivy.el
index f5af50a..fc21d19 100644
--- a/ivy.el
+++ b/ivy.el
@@ -3435,9 +3435,9 @@ When `ivy-calling' isn't nil, call `ivy-occur-press'."
   "Major mode for output from \\[ivy-occur].
 
 \\{ivy-occur-grep-mode-map}"
-  (setq-local view-read-only nil))
-
-(add-hook 'ivy-occur-grep-mode-hook 'wgrep-setup)
+  (setq-local view-read-only nil)
+  (when (fboundp 'wgrep-setup)
+    (wgrep-setup)))
 
 (defvar ivy--occurs-list nil
   "A list of custom occur generators per command.")
@@ -3519,7 +3519,8 @@ updated original buffer."
                (error "buffer was killed"))
              (let ((inhibit-read-only t))
                (erase-buffer)
-               (funcall (plist-get ivy--occurs-list caller) t))))
+               (funcall (plist-get ivy--occurs-list caller) t)
+               (ivy-occur-grep-mode))))
           ((memq caller '(counsel-git-grep counsel-grep counsel-ag counsel-rg))
            (let ((inhibit-read-only t))
              (erase-buffer)



reply via email to

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