[elpa] master f9947de 20/22: Fixup `swiper-query-replace'

[Oleh Krehel]

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

    Fixup `swiper-query-replace'
    
    * swiper.el (swiper-query-replace): Make sure to use `swiper--window'.
    
    * ivy.el (ivy--minibuffer-setup): Remove the `use-local-map' statement,
      the map is already set in `read-from-minibuffer'.
---
 ivy.el    |    2 --
 swiper.el |    5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ivy.el b/ivy.el
index a679f74..07ea004 100644
--- a/ivy.el
+++ b/ivy.el
@@ -626,8 +626,6 @@ When GREEDY is non-nil, join words in a greedy way."
   (set (make-local-variable 'minibuffer-default-add-function)
        (lambda ()
          (list ivy--default)))
-  (use-local-map (make-composed-keymap ivy-minibuffer-map
-                                       (current-local-map)))
   (setq-local max-mini-window-height ivy-height)
   (add-hook 'post-command-hook #'ivy--exhibit nil t)
   ;; show completions with empty input
diff --git a/swiper.el b/swiper.el
index 7a076d1..c58f20f 100644
--- a/swiper.el
+++ b/swiper.el
@@ -90,8 +90,9 @@
       (delete-minibuffer-contents)
       (setq ivy--action
             (lambda ()
-              (perform-replace from to
-                               t t t)))
+              (with-selected-window swiper--window
+                (perform-replace from to
+                                 t t t))))
       (swiper--cleanup)
       (exit-minibuffer))))