branch: externals/embark
commit af67f6d25b60616ace7433fe6ea6f732fb697ddd
Author: Omar Antolín <omar.anto...@gmail.com>
Commit: Omar Antolín <omar.anto...@gmail.com>
Revert "Stylistic change"
This reverts commit 2c9550f4a551b0aef16b341cb137c17a8cb885a2.
That introduced a bug: when the type was nil, you got a "No
candidates" message. :(
---
embark.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/embark.el b/embark.el
index c5477233bb..2b4a6c5c8a 100644
--- a/embark.el
+++ b/embark.el
@@ -2810,11 +2810,10 @@ candidate."
(defun embark-collect--update-candidates (buffer)
"Update candidates for Embark Collect BUFFER."
- (when-let ((transformed (embark--maybe-transform-candidates))
- ;; we need the originals for default action:
- (type (plist-get transformed :orig-type))
- (candidates (plist-get transformed :orig-candidates))
- (affixator (embark-collect--affixator type)))
+ (let* ((transformed (embark--maybe-transform-candidates))
+ (type (plist-get transformed :orig-type)) ; we need the originals for
+ (candidates (plist-get transformed :orig-candidates)) ; default action
+ (affixator (embark-collect--affixator type)))
(when (eq type 'file)
(let ((dir (buffer-local-value 'default-directory buffer)))
(setq candidates
@@ -2825,7 +2824,8 @@ candidate."
(setq candidates (funcall affixator candidates))
(with-current-buffer buffer
(setq embark--type type)
- (embark-collect--format-entries candidates))))
+ (embark-collect--format-entries candidates))
+ candidates))
(defun embark--collect (buffer-name)
"Create an Embark Collect buffer named BUFFER-NAME.
