[elpa] master 564e235 091/167: ivy.el (ivy-occur-press): Extend with-ivy-window

[Oleh Krehel]

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

    ivy.el (ivy-occur-press): Extend with-ivy-window
    
    ivy-occur-action should be called in (ivy--get-window ivy-last).
    
    This means, for purposes of e.g. `counsel-find-symbol' or
    `lispy--action-jump` that if *ivy-occur* is the only window, it will be
    re-used.
    But if the user wants *ivy-occur* not to get buried, then having at
    least 2 windows solves that problem.
---
 ivy.el |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ivy.el b/ivy.el
index 741a5a4..f5dbd94 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2141,13 +2141,14 @@ EVENT gives the mouse position."
          (str (buffer-substring
                (+ 4 (line-beginning-position))
                (line-end-position)))
-         (coll (ivy-state-collection ivy-last)))
-    (funcall ivy-occur-action
-             (if (and (consp coll)
-                      (consp (car coll)))
-                 (cdr (assoc str coll))
-               str))
+         (coll (ivy-state-collection ivy-last))
+         (action ivy-occur-action))
     (with-ivy-window
+      (funcall action
+               (if (and (consp coll)
+                        (consp (car coll)))
+                   (cdr (assoc str coll))
+                 str))
       (pulse-momentary-highlight-one-line (point)))))
 
 (defun ivy-insert-current ()