[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 596461e 005/399: counsel.el (counsel-grep-use-swiper-p): N
From: |
Oleh Krehel |
Subject: |
[elpa] master 596461e 005/399: counsel.el (counsel-grep-use-swiper-p): New defcustom |
Date: |
Sat, 20 Jul 2019 14:56:37 -0400 (EDT) |
branch: master
commit 596461e1ff09431eb417877a9870e53c452e1b62
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
counsel.el (counsel-grep-use-swiper-p): New defcustom
* counsel.el (counsel-grep-use-swiper-p-default): Extract.
(counsel-grep-or-swiper): Update.
Fixes #1908.
---
counsel.el | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/counsel.el b/counsel.el
index af83039..5c4183e 100644
--- a/counsel.el
+++ b/counsel.el
@@ -2828,6 +2828,19 @@ When the number of characters in a buffer exceeds this
threshold,
`counsel-grep' will be used instead of `swiper'."
:type 'integer)
+(defcustom counsel-grep-use-swiper-p #'counsel-grep-use-swiper-p-default
+ "When this function returns non-nil, call `swiper', else `counsel-grep'."
+ :type '(choice
+ (const :tag "Rely on `counsel-grep-swiper-limit'."
+ counsel-grep-use-swiper-p-default)
+ (const :tag "Always use `counsel-grep'." ignore)
+ (function :tag "Custom")))
+
+(defun counsel-grep-use-swiper-p-default ()
+ (<= (buffer-size)
+ (/ counsel-grep-swiper-limit
+ (if (eq major-mode 'org-mode) 4 1))))
+
;;;###autoload
(defun counsel-grep-or-swiper (&optional initial-input)
"Call `swiper' for small buffers and `counsel-grep' for large ones.
@@ -2838,9 +2851,7 @@ When non-nil, INITIAL-INPUT is the initial search
pattern."
(ignore-errors
(file-remote-p buffer-file-name))
(jka-compr-get-compression-info buffer-file-name)
- (<= (buffer-size)
- (/ counsel-grep-swiper-limit
- (if (eq major-mode 'org-mode) 4 1))))
+ (funcall counsel-grep-use-swiper-p))
(swiper initial-input)
(when (file-writable-p buffer-file-name)
(save-buffer))
- [elpa] master updated (64d03d9 -> 33689c1), Oleh Krehel, 2019/07/20
- [elpa] master b4492a3 002/399: counsel.el (counsel-git-checkout-action): Quote branch names, Oleh Krehel, 2019/07/20
- [elpa] master 100bd21 001/399: counsel.el (counsel-M-x): Optionally expand aliases, Oleh Krehel, 2019/07/20
- [elpa] master 08dd58b 003/399: ivy.el (ivy--regex-fuzzy): Don't allow newlines in wildcards, Oleh Krehel, 2019/07/20
- [elpa] master 70ad031 004/399: doc/Changelog.org: Update path to CSS, Oleh Krehel, 2019/07/20
- [elpa] master 596461e 005/399: counsel.el (counsel-grep-use-swiper-p): New defcustom,
Oleh Krehel <=
- [elpa] master 6017cc8 006/399: ivy.el (ivy-read): Keep only one action for one key, Oleh Krehel, 2019/07/20
- [elpa] master dc250bd 008/399: counsel.el (counsel-unicode-char): Don't sort every time, Oleh Krehel, 2019/07/20
- [elpa] master b000b0a 007/399: ivy.el (ivy--recompute-index): Speed up, Oleh Krehel, 2019/07/20
- [elpa] master c2eb4b5 009/399: ivy.el (ivy--kill-buffer-action): Integrate with ivy-switch-buffer-kill, Oleh Krehel, 2019/07/20
- [elpa] master f631d75 013/399: swiper.el (swiper-font-lock-exclude): Add xref--xref-buffer-mode, Oleh Krehel, 2019/07/20
- [elpa] master 3773c26 015/399: swiper.el (swiper--current-window-start): Add docstring, Oleh Krehel, 2019/07/20
- [elpa] master da85d1e 016/399: ivy.el: Require TRAMP earlier, Oleh Krehel, 2019/07/20
- [elpa] master 98b70a7 011/399: swiper.el (swiper--update-input-ivy): Don't recenter when non-graphical, Oleh Krehel, 2019/07/20
- [elpa] master e86cf2e 010/399: counsel.el (counsel-require-program): Change arg meaning, Oleh Krehel, 2019/07/20
- [elpa] master 007d672 012/399: swiper.el (swiper--update-input-ivy): Use display-graphic-p, Oleh Krehel, 2019/07/20