[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master b2d2b82 209/272: counsel.el (counsel-grep-action): Improve
From: |
Oleh Krehel |
Subject: |
[elpa] master b2d2b82 209/272: counsel.el (counsel-grep-action): Improve cleanup |
Date: |
Mon, 25 Apr 2016 10:13:26 +0000 |
branch: master
commit b2d2b822cf4034e09c0c8a7ae02730347486786c
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
counsel.el (counsel-grep-action): Improve cleanup
When the current input goes from matching to non-matching, ensure that
the old overlays are cleaned up.
---
counsel.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/counsel.el b/counsel.el
index e9b706b..9384262 100644
--- a/counsel.el
+++ b/counsel.el
@@ -1361,8 +1361,9 @@ This uses `counsel-ag' with `counsel-pt-base-command'
replacing
nil)))
(defun counsel-grep-action (x)
- (when (string-match "\\`\\([0-9]+\\):\\(.*\\)\\'" x)
- (with-ivy-window
+ (with-ivy-window
+ (swiper--cleanup)
+ (when (string-match "\\`\\([0-9]+\\):\\(.*\\)\\'" x)
(let ((file-name counsel--git-grep-dir)
(line-number (match-string-no-properties 1 x)))
(find-file file-name)
@@ -1372,7 +1373,6 @@ This uses `counsel-ag' with `counsel-pt-base-command'
replacing
(if (eq ivy-exit 'done)
(swiper--ensure-visible)
(unless (eq ivy-exit 'done)
- (swiper--cleanup)
(isearch-range-invisible (line-beginning-position)
(line-end-position))
(swiper--add-overlays (ivy--regex ivy-text))))))))
- [elpa] master ac4bedf 175/272: counsel.el (counsel-find-file): Bind "M-o f" to find-file-other-window, (continued)
- [elpa] master ac4bedf 175/272: counsel.el (counsel-find-file): Bind "M-o f" to find-file-other-window, Oleh Krehel, 2016/04/25
- [elpa] master 41e2e41 246/272: Clean-up previous change, Oleh Krehel, 2016/04/25
- [elpa] master 90a09fa 086/272: doc/ivy.org: CUSTOM_ID should not end in "?", Oleh Krehel, 2016/04/25
- [elpa] master 6254e88 244/272: Allow a sexp node in ivy-views, Oleh Krehel, 2016/04/25
- [elpa] master e224847 179/272: ivy.el (ivy--reset-state): Fix prompt / require-match issue, Oleh Krehel, 2016/04/25
- [elpa] master 5229ebe 173/272: counsel.el (counsel-prompt-function-dir): Fix format, Oleh Krehel, 2016/04/25
- [elpa] master 8de2930 221/272: ivy.el: Improve "M-n", Oleh Krehel, 2016/04/25
- [elpa] master 6823518 196/272: swiper.el (swiper--candidates): Always remove '(field), Oleh Krehel, 2016/04/25
- [elpa] master d45ee54 258/272: Make the slash more magic during file name completion, Oleh Krehel, 2016/04/25
- [elpa] master ea79f0e 135/272: New API function ivy-set-display-transformer, Oleh Krehel, 2016/04/25
- [elpa] master b2d2b82 209/272: counsel.el (counsel-grep-action): Improve cleanup,
Oleh Krehel <=
- [elpa] master 8c4f595 233/272: Fix remapping commit c9b6e0, Oleh Krehel, 2016/04/25
- [elpa] master 6fae6e0 259/272: counsel.el (counsel-grep-or-swiper): Use swiper when narrowed, Oleh Krehel, 2016/04/25
- [elpa] master 1b4e819 218/272: ivy.el (ivy-next-history-element): Simplify, Oleh Krehel, 2016/04/25
- [elpa] master b5a9dc5 255/272: ivy.el (ivy--reset-state): file-directory-p needs a string, Oleh Krehel, 2016/04/25
- [elpa] master 6fc36b5 210/272: option to add newline after ivy-read prompt, Oleh Krehel, 2016/04/25
- [elpa] master 9899547 235/272: ivy.el (ivy-action): New face, Oleh Krehel, 2016/04/25
- [elpa] master 63b96a1 250/272: Fix counsel-grep-last-line bug, Oleh Krehel, 2016/04/25
- [elpa] master a891df3 264/272: swiper.el (swiper--multi-candidates): Add check, Oleh Krehel, 2016/04/25
- [elpa] master 5ce2623 223/272: counsel.el (counsel-git): Add "j" action, Oleh Krehel, 2016/04/25
- [elpa] master ee27e27 161/272: ivy.el (ivy-occur-revert-buffer): Move code to swiper-occur, Oleh Krehel, 2016/04/25