[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master f9e8116 344/399: swiper.el (swiper-isearch-action): Fix ou
From: |
Oleh Krehel |
Subject: |
[elpa] master f9e8116 344/399: swiper.el (swiper-isearch-action): Fix outlines getting over-revealed |
Date: |
Sat, 20 Jul 2019 14:57:54 -0400 (EDT) |
branch: master
commit f9e811600940978f469bbe422f5308616d337f6e
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
swiper.el (swiper-isearch-action): Fix outlines getting over-revealed
* swiper.el (swiper-isearch-action): The change to
`isearch-range-invisible' params is important here.
(swiper-isearch): Clean up the overlays here, instead of in
`swiper--cleanup'.
Expected behavior after the fix: all outlines that were revealed are
closed, either on finish or on abort. The exception is the outline
that contains the point.
Fixes #2119
---
swiper.el | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/swiper.el b/swiper.el
index 7c645c2..70b0f55 100644
--- a/swiper.el
+++ b/swiper.el
@@ -679,6 +679,7 @@ When capture groups are present in the input, print them
instead of lines."
(bound-and-true-p reveal-mode))
(reveal-mode -1))
(lazy-highlight-cleanup t)
+ (setq isearch-opened-overlays nil)
(when (bound-and-true-p evil-mode)
(evil-set-jump)))
@@ -810,9 +811,6 @@ Matched candidates should have `swiper-invocation-face'."
;; force cleanup unless it's :unwind
(lazy-highlight-cleanup
(if (eq ivy-exit 'done) lazy-highlight-cleanup t))
- (save-excursion
- (goto-char (point-min))
- (isearch-clean-overlays))
(when (timerp swiper--isearch-highlight-timer)
(cancel-timer swiper--isearch-highlight-timer)
(setq swiper--isearch-highlight-timer nil)))
@@ -1338,8 +1336,7 @@ that we search only for one character."
(setq x (get-text-property 0 'point x))))
(with-ivy-window
(goto-char x)
- (isearch-range-invisible (line-beginning-position)
- (line-end-position))
+ (isearch-range-invisible (point) (1+ (point)))
(unless (eq ivy-exit 'done)
(swiper--cleanup)
(swiper--delayed-add-overlays)
@@ -1506,6 +1503,7 @@ When not running `swiper-isearch' already, start it."
(point))
(unless (or res swiper-stay-on-quit)
(goto-char swiper--opoint))
+ (isearch-clean-overlays)
(unless (or res (string= ivy-text ""))
(cl-pushnew ivy-text swiper-history)))))
- [elpa] master 40d8114 338/399: counsel.el (counsel-shell-command-history): Remove obsolete command, (continued)
- [elpa] master 40d8114 338/399: counsel.el (counsel-shell-command-history): Remove obsolete command, Oleh Krehel, 2019/07/20
- [elpa] master f0a2341 337/399: counsel.el (counsel-rhythmbox): Add :require-match, Oleh Krehel, 2019/07/20
- [elpa] master 4de54f1 340/399: ivy.el (ivy-reverse-i-search-kill): Add and bind to "C-k", Oleh Krehel, 2019/07/20
- [elpa] master 7201c0f 334/399: ivy-hydra.el (ivy-dispatching-done-hydra-exit-keys): Extract, Oleh Krehel, 2019/07/20
- [elpa] master 935603e 310/399: ivy.el (ivy--done): Press "RET" or "C-m" to create a directory, Oleh Krehel, 2019/07/20
- [elpa] master a20c196 336/399: counsel.el (counsel-set-variable): Better annotations for options, Oleh Krehel, 2019/07/20
- [elpa] master cea24b7 339/399: counsel.el (counsel-expression-history): Remove obsolete command, Oleh Krehel, 2019/07/20
- [elpa] master 9f6141f 345/399: counsel.el (counsel--browse-history): Allow to remove elements with "C-k", Oleh Krehel, 2019/07/20
- [elpa] master 673c45e 342/399: ivy.el (ivy--minibuffer-setup): Set line-spacing to nil in the minibuffer, Oleh Krehel, 2019/07/20
- [elpa] master 8d7578f 346/399: counsel.el (counsel--browse-history): Better prompt, Oleh Krehel, 2019/07/20
- [elpa] master f9e8116 344/399: swiper.el (swiper-isearch-action): Fix outlines getting over-revealed,
Oleh Krehel <=
- [elpa] master f29207f 324/399: Add ability to resume dynamic collections, Oleh Krehel, 2019/07/20
- [elpa] master 3b1a25b 331/399: ivy-test.el (counsel-find-file-with-dotfiles): Fix, Oleh Krehel, 2019/07/20
- [elpa] master 8fc254f 341/399: counsel.el (counsel--setq-doconst): Fix compiler warning, Oleh Krehel, 2019/07/20
- [elpa] master 1c436f6 347/399: ivy.el (ivy-reverse-i-search): Don't call another ivy-reverse-i-search, Oleh Krehel, 2019/07/20
- [elpa] master 975c2af 348/399: ivy.el (ivy-reverse-i-search): Error when called from top-level, Oleh Krehel, 2019/07/20
- [elpa] master 888b417 350/399: ivy.el (ivy--recompute-index-inhibit): Add, Oleh Krehel, 2019/07/20
- [elpa] master 4c9c14a 356/399: ivy.el (ivy--minibuffer-cleanup): Rename from ivy--cleanup, Oleh Krehel, 2019/07/20
- [elpa] master 4324211 354/399: ivy.el (ivy-read): Factor out transformer-fn, Oleh Krehel, 2019/07/20
- [elpa] master d52c176 351/399: ivy.el (ivy-switch-buffer-kill): Move from "C-c C-k" to "C-k", Oleh Krehel, 2019/07/20
- [elpa] master 7925637 353/399: ivy.el (ivy--compute-extra-candidates): Extract, Oleh Krehel, 2019/07/20