[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 4e9e310 368/399: ivy.el (ivy-read): Fix swiper-query-repla
From: |
Oleh Krehel |
Subject: |
[elpa] master 4e9e310 368/399: ivy.el (ivy-read): Fix swiper-query-replace not working |
Date: |
Sat, 20 Jul 2019 14:58:01 -0400 (EDT) |
branch: master
commit 4e9e31034178e1a4be0896cc5e62dbe16a4827ee
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy-read): Fix swiper-query-replace not working
Need to return (ivy-state-current ivy-last) from that specific point,
since later `ivy-last' changes to the outer one of `swiper'.
---
ivy.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ivy.el b/ivy.el
index 83750b2..99613b0 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1973,7 +1973,8 @@ customizations apply to the current completion session."
(ivy--display-function
(when (or ivy-recursive-last
(not (window-minibuffer-p)))
- (ivy-alist-setting ivy-display-functions-alist caller))))
+ (ivy-alist-setting ivy-display-functions-alist caller)))
+ result)
(setq ivy-last
(make-ivy-state
:prompt prompt
@@ -2033,10 +2034,12 @@ customizations apply to the current completion session."
(unless (equal item "")
(set hist (cons (propertize item 'ivy-index ivy--index)
(delete item
- (cdr (symbol-value hist))))))))))
+ (cdr (symbol-value hist))))))))
+ (setq result (ivy-state-current ivy-last))))
(ivy--cleanup))
(ivy-call)
- (ivy--remove-props (ivy-state-current ivy-last) 'idx)))
+ (ivy--remove-props (ivy-state-current ivy-last) 'idx)
+ result))
(defun ivy--cleanup ()
;; Fixes a bug in ESS, #1660
- [elpa] master 7925637 353/399: ivy.el (ivy--compute-extra-candidates): Extract, (continued)
- [elpa] master 7925637 353/399: ivy.el (ivy--compute-extra-candidates): Extract, Oleh Krehel, 2019/07/20
- [elpa] master f6876a7 359/399: ivy.el (ivy-read): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 460d6e3 355/399: ivy.el (ivy-read): Refactor, Oleh Krehel, 2019/07/20
- [elpa] master ebac0e9 352/399: ivy.el (ivy--compute-extra-actions): Extract, Oleh Krehel, 2019/07/20
- [elpa] master bae8e46 361/399: ivy.el (ivy--magic-file-doubleslash-directory): Cd remote "/" on "//", Oleh Krehel, 2019/07/20
- [elpa] master a87bdd2 358/399: ivy.el (ivy-read): Refactor, Oleh Krehel, 2019/07/20
- [elpa] master 5e1c468 357/399: ivy.el (ivy--cleanup): Extract, Oleh Krehel, 2019/07/20
- [elpa] master 520fd83 360/399: ivy.el (ivy-read): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 2d22e05 363/399: doc/ivy.org: Add more info on TRAMP, Oleh Krehel, 2019/07/20
- [elpa] master 180d329 365/399: swiper.el (swiper--re-builder): Improve for char-fold-to-regexp, Oleh Krehel, 2019/07/20
- [elpa] master 4e9e310 368/399: ivy.el (ivy-read): Fix swiper-query-replace not working,
Oleh Krehel <=
- [elpa] master a0b71a1 362/399: ivy.el (ivy--magic-tilde-directory): Cd remote "~" on "~", Oleh Krehel, 2019/07/20
- [elpa] master 3af75cf 364/399: swiper.el (swiper--positive-regexps): Extract, Oleh Krehel, 2019/07/20
- [elpa] master 916e281 367/399: ivy.el (ivy-read): Fix bad refactor, Oleh Krehel, 2019/07/20
- [elpa] master 1ea4ebb 370/399: Fix minor typo, Oleh Krehel, 2019/07/20
- [elpa] master 2fa7cec 366/399: ivy-test.el (swiper--re-builder): Add test, Oleh Krehel, 2019/07/20
- [elpa] master 57e77a5 372/399: counsel.el (counsel-git-log-split-string-re): Change., Oleh Krehel, 2019/07/20
- [elpa] master 72a827a 373/399: counsel.el (counsel-git-log): Add additional action., Oleh Krehel, 2019/07/20
- [elpa] master 259cf07 374/399: Fix ivy-previous-line-or-history, Oleh Krehel, 2019/07/20
- [elpa] master d91f61d 378/399: counsel.el (counsel--split-string): Extract, Oleh Krehel, 2019/07/20
- [elpa] master e858b10 371/399: Add autoload for various commands, Oleh Krehel, 2019/07/20