[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.")
- [elpa] master updated (90473ac -> 0c2da66), Oleh Krehel, 2015/03/26
- [elpa] master 2ae5b9c 3/7: swiper.el (swiper-font-lock-ensure): Ignore gnus modes, Oleh Krehel, 2015/03/26
- [elpa] master abb6e0b 5/7: swiper.el (swiper-query-replace): Call only in minibuffer,
Oleh Krehel <=
- [elpa] master 764e003 1/7: swiper.el (swiper-font-lock-ensure): Omit erc-mode, Oleh Krehel, 2015/03/26
- [elpa] master fdb0c45 4/7: Add swiper-query-replace, Oleh Krehel, 2015/03/26
- [elpa] master d63ce8f 2/7: Ensure that inserted candidates don't have read-only property, Oleh Krehel, 2015/03/26
- [elpa] master 0c2da66 7/7: Merge commit 'ce516073e5e4359b88f98610bae9b157945eb8e8' from swiper, Oleh Krehel, 2015/03/26
- [elpa] master ce51607 6/7: Allow to cancel "M-q" with "C-g", Oleh Krehel, 2015/03/26