[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e7146e5 089/399: counsel.el (counsel-git-grep-count-functi
From: |
Oleh Krehel |
Subject: |
[elpa] master e7146e5 089/399: counsel.el (counsel-git-grep-count-function): Fix |
Date: |
Sat, 20 Jul 2019 14:56:55 -0400 (EDT) |
branch: master
commit e7146e58f94b1c519635596944f008f3ba28b546
Author: Basil L. Contovounesios <address@hidden>
Commit: Oleh Krehel <address@hidden>
counsel.el (counsel-git-grep-count-function): Fix
Fix quoting in custom :type and clarify documentation.
Declare obsolete varaliases before their referents.
Re: #1402
Fixes #1975
---
counsel.el | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/counsel.el b/counsel.el
index 8db26d3..bd65c4f 100644
--- a/counsel.el
+++ b/counsel.el
@@ -1409,6 +1409,11 @@ COMMAND fails. Obey file handlers based on
`default-directory'."
(signal (car status) (cdr status))))
(delete-file stderr))))
+(define-obsolete-variable-alias 'counsel--git-grep-count-func
+ 'counsel-git-grep-count-function "0.11.0")
+(define-obsolete-function-alias 'counsel--git-grep-count-func-default
+ 'counsel-git-grep-count-function-du "0.11.0")
+
(defun counsel-git-grep-count-function-du ()
"Default function to calculate `counsel--git-grep-count'."
(or (unless (eq system-type 'windows-nt)
@@ -1418,19 +1423,15 @@ COMMAND fails. Obey file handlers based on
`default-directory'."
0))
(defcustom counsel-git-grep-count-function #'counsel-git-grep-count-function-du
- "Defun to calculate `counsel--git-grep-count' for `counsel-git-grep'."
- :type '(choice
- (const :tag "Grep always does filtering."
+ "Function to calculate `counsel--git-grep-count' for `counsel-git-grep'."
+ :type '(radio
+ (function-item :doc "Always filter with Grep"
(lambda () most-positive-fixnum))
- (const :tag "Emacs always does filtering."
+ (function-item :doc "Always filter with Emacs"
(lambda () 0))
- (const :tag "Decide on Grep or Emacs based on .git directory size."
- 'counsel-git-grep-count-function-du)))
-
-(define-obsolete-variable-alias 'counsel--git-grep-count-func
- 'counsel-git-grep-count-function "0.11.0")
-(define-obsolete-function-alias 'counsel--git-grep-count-func-default
- 'counsel-git-grep-count-function-du "0.11.0")
+ (function-item
+ :doc "Choose between Grep or Emacs based on .git directory size"
+ counsel-git-grep-count-function-du)))
;;;###autoload
(defun counsel-git-grep (&optional cmd initial-input)
- [elpa] master 0c30e3f 063/399: counsel.el: Minor compile history cleanup, (continued)
- [elpa] master 0c30e3f 063/399: counsel.el: Minor compile history cleanup, Oleh Krehel, 2019/07/20
- [elpa] master 114ae96 070/399: counsel.el: Find project root more flexibly, Oleh Krehel, 2019/07/20
- [elpa] master 5aa263c 079/399: counsel.el (counsel-compile-make-pattern): Fix regex, Oleh Krehel, 2019/07/20
- [elpa] master cc50da2 080/399: counsel.el (counsel-dired-jump-args): Fix -type d, Oleh Krehel, 2019/07/20
- [elpa] master a473519 086/399: Fix error in ivy-make-magic-action, Oleh Krehel, 2019/07/20
- [elpa] master 9ce9e4e 090/399: counsel.el (counsel-compile-phony-pattern): Fixup, Oleh Krehel, 2019/07/20
- [elpa] master 1046fc7 095/399: ivy.el (ivy-avy): Use non-obsolete avy-process, Oleh Krehel, 2019/07/20
- [elpa] master 27add46 092/399: Anchor pcre lookaround patterns to bol, Oleh Krehel, 2019/07/20
- [elpa] master 3e1e905 083/399: Fix virtual buffers in counsel-switch-buffer, Oleh Krehel, 2019/07/20
- [elpa] master cbdc9c9 078/399: counsel.el (counsel--compile-get-make-targets): Rename, Oleh Krehel, 2019/07/20
- [elpa] master e7146e5 089/399: counsel.el (counsel-git-grep-count-function): Fix,
Oleh Krehel <=
- [elpa] master b180abf 087/399: counsel.el (counsel-compile): clean-up get-make-targets, Oleh Krehel, 2019/07/20
- [elpa] master 456e575 093/399: Don't bury killed buffers after counsel-switch-buffer, Oleh Krehel, 2019/07/20
- [elpa] master 1c84179 098/399: counsel.el (counsel-rg): Add an example to the doc, Oleh Krehel, 2019/07/20
- [elpa] master b154260 097/399: counsel.el (counsel-grep): Fix TRAMP problems, Oleh Krehel, 2019/07/20
- [elpa] master adab07d 101/399: counsel.el: Simplify counsel-git-grep, Oleh Krehel, 2019/07/20
- [elpa] master 5b4dbbc 096/399: ivy.el: Silence byte-compiler, Oleh Krehel, 2019/07/20
- [elpa] master 3954bfe 081/399: counsel.el (counsel-compile): Don't modify compilation-start-hook permanently, Oleh Krehel, 2019/07/20
- [elpa] master d92d43a 085/399: counsel.el (counsel-compile-root-functions): Tidy, Oleh Krehel, 2019/07/20
- [elpa] master 2356a1d 091/399: ivy-test.el (counsel--grep-regex): Extend test, Oleh Krehel, 2019/07/20
- [elpa] master cdd7ada 094/399: counsel.el (counsel-url-expand): Avoid null error, Oleh Krehel, 2019/07/20