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'.

diff --git a/ivy.el b/ivy.el
index a679f74cd180756dd568d0834dd90e9fe1d17e2b..07ea00419016b91eae89252084f1aacabbaa66f7 100644 (file)
--- 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 7a076d199a943dd7aef8f0cfd987651c1be86c81..c58f20fed6ce2ea9739ad50ce97cc5f735d137d4 100644 (file)
--- 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))))