branch: master
commit 435e9d4c346e470189baabc3dbb1a69b6ca6f015
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
Use :caller for ivy-re-builders-alist
* counsel.el (counsel-M-x): Add :caller.
* ivy.el (ivy--reset-state): Use :caller.
---
counsel.el | 3 ++-
ivy.el | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/counsel.el b/counsel.el
index 0ced4b9..e2dc27c 100644
--- a/counsel.el
+++ b/counsel.el
@@ -896,7 +896,8 @@ Optional INITIAL-INPUT is the initial input in the
minibuffer."
(command-execute (intern cmd) 'record)))
:sort sort
:keymap counsel-describe-map
- :initial-input initial-input)))
+ :initial-input initial-input
+ :caller 'counsel-M-x)))
(declare-function powerline-reset "ext:powerline")
diff --git a/ivy.el b/ivy.el
index f2cd67f..7d25c50 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1161,7 +1161,8 @@ This is useful for recursive `ivy-read'."
(re-builder (ivy-state-re-builder state))
(dynamic-collection (ivy-state-dynamic-collection state))
(initial-input (ivy-state-initial-input state))
- (require-match (ivy-state-require-match state)))
+ (require-match (ivy-state-require-match state))
+ (caller (ivy-state-caller state)))
(unless initial-input
(setq initial-input (cdr (assoc this-command
ivy-initial-inputs-alist))))
@@ -1171,6 +1172,8 @@ This is useful for recursive `ivy-read'."
(or re-builder
(and (functionp collection)
(cdr (assoc collection ivy-re-builders-alist)))
+ (and caller
+ (cdr (assoc caller ivy-re-builders-alist)))
(cdr (assoc t ivy-re-builders-alist))
'ivy--regex))
(setq ivy--subexps 0)
