branch: externals/ivy-hydra
commit e2f1fe15a02c513fd8c91d7d129182156e883930
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
swiper.el (swiper--query-replace-updatefn): Fix bug
---
swiper.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/swiper.el b/swiper.el
index 21ddb8e..687e1e9 100644
--- a/swiper.el
+++ b/swiper.el
@@ -160,7 +160,7 @@ Treated as non-nil when searching backwards."
lisp
(set-match-data (overlay-get ov 'md))
(condition-case nil
- (with-current-buffer (nth 4 (overlay-get ov 'md))
+ (with-current-buffer (overlay-buffer ov)
(match-substitute-replacement ivy-text))
(error ivy-text)))
'face 'error)))))
@@ -172,7 +172,7 @@ Treated as non-nil when searching backwards."
(defun swiper--query-replace-setup ()
(with-ivy-window
(let ((end (window-end (selected-window) t))
- (re (ivy--regex ivy-text)))
+ (re ivy--old-re))
(save-excursion
(beginning-of-line)
(while (re-search-forward re end t)
@@ -200,7 +200,7 @@ Treated as non-nil when searching backwards."
(swiper--query-replace-setup)
(unwind-protect
(let* ((enable-recursive-minibuffers t)
- (from (ivy--regex ivy-text))
+ (from ivy--old-re)
(default
(format "\\,(concat %s)"
(if (<= ivy--subexps 1)
@@ -252,6 +252,7 @@ Treated as non-nil when searching backwards."
(goto-char (point-min))
(perform-replace from to t t nil)))
(set-window-configuration wnd-conf))))))))
+(put 'swiper-all-query-replace 'no-counsel-M-x t)
(defvar avy-all-windows)
(defvar avy-style)
