[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0efbf6e 055/272: Simplify the signature for :dynamic-colle
From: |
Oleh Krehel |
Subject: |
[elpa] master 0efbf6e 055/272: Simplify the signature for :dynamic-collection functions |
Date: |
Mon, 25 Apr 2016 10:13:16 +0000 |
branch: master
commit 0efbf6e3c93621e35fe4c74462720edb205b3759
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Simplify the signature for :dynamic-collection functions
* ivy.el (ivy--reset-state): When given :dynamic-collection, assume the
collection function only needs one argument - the string input.
* counsel.el (counsel-ag-function):
(counsel-locate-function):
(counsel-grep-function):
(counsel-recoll-function): Simplify arglist.
---
counsel.el | 8 ++++----
ivy.el | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/counsel.el b/counsel.el
index c5ea288..ddf3d4f 100644
--- a/counsel.el
+++ b/counsel.el
@@ -683,7 +683,7 @@ Update the minibuffer with the amount of lines collected
every
"\\\\(" "("
str)))
-(defun counsel-locate-function (str &rest _u)
+(defun counsel-locate-function (str)
(if (< (length str) 3)
(counsel-more-chars 3)
(counsel--async-command
@@ -1166,7 +1166,7 @@ command. %S will be replaced by the regex string. The
default is
:type 'stringp
:group 'ivy)
-(defun counsel-ag-function (string &optional _pred &rest _unused)
+(defun counsel-ag-function (string)
"Grep in the current directory for STRING."
(if (< (length string) 3)
(counsel-more-chars 3)
@@ -1214,7 +1214,7 @@ INITIAL-INPUT can be given as the initial minibuffer
input."
(swiper--cleanup))
:caller 'counsel-grep))
-(defun counsel-grep-function (string &optional _pred &rest _unused)
+(defun counsel-grep-function (string)
"Grep in the current directory for STRING."
(if (< (length string) 3)
(counsel-more-chars 3)
@@ -1238,7 +1238,7 @@ INITIAL-INPUT can be given as the initial minibuffer
input."
(swiper--cleanup)
(swiper--add-overlays (ivy--regex ivy-text)))))))
-(defun counsel-recoll-function (string &optional _pred &rest _unused)
+(defun counsel-recoll-function (string)
"Grep in the current directory for STRING."
(if (< (length string) 3)
(counsel-more-chars 3)
diff --git a/ivy.el b/ivy.el
index fb251d1..9bc5fb3 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1245,6 +1245,8 @@ This is useful for recursive `ivy-read'."
(setq initial-input nil))))
((eq collection 'internal-complete-buffer)
(setq coll (ivy--buffer-list "" ivy-use-virtual-buffers)))
+ (dynamic-collection
+ (setq coll (funcall collection ivy-text)))
((or (functionp collection)
(byte-code-function-p collection)
(vectorp collection)
- [elpa] master 6ae91f7 213/272: Make ivy-set-sources work also for sync completion, (continued)
- [elpa] master 6ae91f7 213/272: Make ivy-set-sources work also for sync completion, Oleh Krehel, 2016/04/25
- [elpa] master f7c7114 037/272: ivy-test.el (ivy--regex-ignore-order): New test, Oleh Krehel, 2016/04/25
- [elpa] master 1088078 266/272: When selecting a non-existing key in an alist, return that key, Oleh Krehel, 2016/04/25
- [elpa] master 341b5a2 229/272: counsel-grep should pick candidates closest to point, Oleh Krehel, 2016/04/25
- [elpa] master d71b5c5 081/272: swiper.el (swiper--action): Update regexp-search-ring, Oleh Krehel, 2016/04/25
- [elpa] master e1c156b 074/272: ivy.el (ivy--resize-minibuffer-to-fit): Check frame-root-window-p, Oleh Krehel, 2016/04/25
- [elpa] master ebd3e29 089/272: swiper.el (swiper--update-input-ivy): Fix a bug, Oleh Krehel, 2016/04/25
- [elpa] master de0e541 234/272: Speed up counsel-grep by up to 40 times, Oleh Krehel, 2016/04/25
- [elpa] master 299bc13 097/272: Fix initial-input not set to nil for 'read-file-name-internal, Oleh Krehel, 2016/04/25
- [elpa] master bab5aab 269/272: doc/Changelog.org: Prepare for the 0.8.0 release, Oleh Krehel, 2016/04/25
- [elpa] master 0efbf6e 055/272: Simplify the signature for :dynamic-collection functions,
Oleh Krehel <=
- [elpa] master 6a5a688 201/272: counsel.el: Improve counsel-grep, Oleh Krehel, 2016/04/25
- [elpa] master 65cf724 247/272: Make ivy--regex work with "[^ ]", Oleh Krehel, 2016/04/25
- [elpa] master f72cea2 253/272: swiper.el (swiper-mc): Restore interactive, Oleh Krehel, 2016/04/25
- [elpa] master 08d5578 137/272: counsel.el (counsel-git-log): New command, Oleh Krehel, 2016/04/25
- [elpa] master 00f08f7 073/272: Improve Ivy documentation UI, Oleh Krehel, 2016/04/25
- [elpa] master 8f527d7 149/272: ivy.el (ivy-next-history-element): No "\\_<" for dynamic-collection, Oleh Krehel, 2016/04/25
- [elpa] master 265bf49 251/272: counsel.el: Fix compile warning, Oleh Krehel, 2016/04/25
- [elpa] master 7cf13a7 186/272: counsel.el (counsel-linux-app): New command, Oleh Krehel, 2016/04/25
- [elpa] master 31a2f86 238/272: counsel.el (counsel-expression-history): enable-recursive-minibuffers, Oleh Krehel, 2016/04/25
- [elpa] master 5299c0a 099/272: doc/ivy.texi: Re-export from previous commit, Oleh Krehel, 2016/04/25