[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 76ef143 258/399: swiper.el (swiper-isearch): Fix ivy-occur
From: |
Oleh Krehel |
Subject: |
[elpa] master 76ef143 258/399: swiper.el (swiper-isearch): Fix ivy-occur |
Date: |
Sat, 20 Jul 2019 14:57:35 -0400 (EDT) |
branch: master
commit 76ef14399c9ea656b06b3cf9ccdb163e4d06c942
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
swiper.el (swiper-isearch): Fix ivy-occur
---
swiper.el | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/swiper.el b/swiper.el
index cc7d417..ec562e8 100644
--- a/swiper.el
+++ b/swiper.el
@@ -538,6 +538,8 @@ such as `scroll-conservatively' are set to a high value.")
(defun swiper--occur-cands (fname cands)
(when cands
(with-current-buffer (ivy-state-buffer ivy-last)
+ (when (eq (ivy-state-caller ivy-last) 'swiper-isearch)
+ (setq cands (mapcar #'swiper--line-at-point cands)))
(let* ((pt-min (point-min))
(line-delta
(save-restriction
@@ -1279,7 +1281,9 @@ come back to the same place as when \"a\" was initially
entered.")
(defun swiper-isearch-action (x)
"Move to X for `swiper-isearch'."
- (if (numberp x)
+ (if (or (numberp x)
+ (and (> (length x) 0)
+ (setq x (get-text-property 0 'point x))))
(with-ivy-window
(goto-char x)
(isearch-range-invisible (line-beginning-position)
- [elpa] master 58b6f7d 257/399: swiper.el (swiper--isearch-format): Don't use blending for the current match, (continued)
- [elpa] master 58b6f7d 257/399: swiper.el (swiper--isearch-format): Don't use blending for the current match, Oleh Krehel, 2019/07/20
- [elpa] master f628441 259/399: swiper.el (swiper-isearch): Fix "C-r", Oleh Krehel, 2019/07/20
- [elpa] master 743163c 260/399: counsel.el (counsel-minor-history): New history variable, Oleh Krehel, 2019/07/20
- [elpa] master cbb3ee1 262/399: counsel.el (counsel-company): Don't rely on company-point, Oleh Krehel, 2019/07/20
- [elpa] master 77a5ffc 261/399: counsel.el (counsel-package-history): New history variable, Oleh Krehel, 2019/07/20
- [elpa] master d5c9673 265/399: swiper.el (swiper--isearch-format): Fix permanent face modifications, Oleh Krehel, 2019/07/20
- [elpa] master 2c57036 263/399: ivy.el (ivy-call): Modify the API for ivy-action second arg, Oleh Krehel, 2019/07/20
- [elpa] master bea44b7 264/399: counsel.el: Fix compiler warnings, Oleh Krehel, 2019/07/20
- [elpa] master a2af29b 271/399: ivy.el (ivy--occur-insert-lines): Fix missing line numbers, Oleh Krehel, 2019/07/20
- [elpa] master 9a9e3e4 251/399: ivy-test.el (swiper--isearch-format): Add test, Oleh Krehel, 2019/07/20
- [elpa] master 76ef143 258/399: swiper.el (swiper-isearch): Fix ivy-occur,
Oleh Krehel <=
- [elpa] master c6977eb 266/399: ivy.el (ivy-read): Add :multi-action arg, Oleh Krehel, 2019/07/20
- [elpa] master df0d980 267/399: Modify counsel-unicode-char's copy action to use actual result, Oleh Krehel, 2019/07/20
- [elpa] master 19ff7cf 270/399: counsel.el (counsel-register-action): Tweak error, Oleh Krehel, 2019/07/20
- [elpa] master 4898a5e 272/399: counsel.el (counsel-compile): better handling for counsel--get-build-subdirs, Oleh Krehel, 2019/07/20
- [elpa] master e95a16b 275/399: Shrink ivy window after read action., Oleh Krehel, 2019/07/20
- [elpa] master 226171b 268/399: ivy.el (ivy--occur-insert-lines): Don't highlight the file name part, Oleh Krehel, 2019/07/20
- [elpa] master e8f9370 273/399: counsel.el (counsel-compile): nreverse recent history, Oleh Krehel, 2019/07/20
- [elpa] master b65cdb5 274/399: counsel.el (counsel-compile): track build dir for the benefit of M-i, Oleh Krehel, 2019/07/20
- [elpa] master a18de2f 269/399: counsel.el (counsel-register): Add, Oleh Krehel, 2019/07/20
- [elpa] master fbf654c 276/399: counsel.el (counsel-company): Rely on company-prefix if company-common is nil, Oleh Krehel, 2019/07/20