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

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

[elpa] master abb6e0b 5/7: swiper.el (swiper-query-replace): Call only i


From: Oleh Krehel
Subject: [elpa] master abb6e0b 5/7: swiper.el (swiper-query-replace): Call only in minibuffer
Date: Thu, 26 Mar 2015 11:30:31 +0000

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

    swiper.el (swiper-query-replace): Call only in minibuffer
---
 swiper.el |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/swiper.el b/swiper.el
index 6fa2f55..a57004f 100644
--- a/swiper.el
+++ b/swiper.el
@@ -81,16 +81,18 @@
 (defun swiper-query-replace ()
   "Start `query-replace' with string to replace from last search string."
   (interactive)
-  (delete-minibuffer-contents)
-  (setq ivy--action
-        (lambda ()
-          (let ((from (ivy--regex ivy-text)))
-            (perform-replace
-             from
-             (query-replace-read-to from "Query replace" t)
-             t t t))))
-  (swiper--cleanup)
-  (exit-minibuffer))
+  (if (null (window-minibuffer-p))
+      (user-error "Should only be called in the minibuffer through 
`swiper-map'")
+    (delete-minibuffer-contents)
+    (setq ivy--action
+          (lambda ()
+            (let ((from (ivy--regex ivy-text)))
+              (perform-replace
+               from
+               (query-replace-read-to from "Query replace" t)
+               t t t))))
+    (swiper--cleanup)
+    (exit-minibuffer)))
 
 (defvar swiper--window nil
   "Store the current window.")



reply via email to

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