[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia 2f849d8 013/241: Simplify marginalia--comple
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia 2f849d8 013/241: Simplify marginalia--completion-metadata-get |
Date: |
Fri, 28 May 2021 20:48:47 -0400 (EDT) |
branch: externals/marginalia
commit 2f849d8ff80907c26c82e8584a3e283172d62bac
Author: Omar Antolín <omar.antolin@gmail.com>
Commit: Omar Antolín <omar.antolin@gmail.com>
Simplify marginalia--completion-metadata-get
The new simpler function is :before-until advice (the previous
function was :around advice).
---
marginalia.el | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index 8cea9cf..f7963bb 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -207,7 +207,7 @@ Annotations are only shown if `marginalia-mode' is enabled."
(mapcar (lambda (cand) (concat cand (funcall annotate cand))) candidates)
candidates))
-(defun marginalia--completion-metadata-get (fun metadata prop)
+(defun marginalia--completion-metadata-get (metadata prop)
"Advice for `completion-metadata-get'.
Replaces the category and annotation function.
FUN is the original function.
@@ -216,14 +216,11 @@ PROP is the property which is looked up."
;; TODO add more category classifiers from Embark
(pcase prop
('annotation-function
- (or (when-let (cat (marginalia--category-type))
- (alist-get cat marginalia-annotate-alist))
- (funcall fun metadata prop)))
+ (when-let (cat (marginalia--category-type))
+ (alist-get cat marginalia-annotate-alist)))
('category
- (or (and marginalia--this-command
- (alist-get marginalia--this-command
marginalia-command-category-alist))
- (funcall fun metadata prop)))
- (_ (funcall fun metadata prop))))
+ (and marginalia--this-command
+ (alist-get marginalia--this-command
marginalia-command-category-alist)))))
(defun marginalia--minibuffer-setup ()
"Setup minibuffer for `marginalia-mode'.
@@ -256,7 +253,7 @@ Remember `this-command' for annotation."
(add-hook 'minibuffer-setup-hook #'marginalia--minibuffer-setup)
;; Replace the metadata function.
- (advice-add #'completion-metadata-get :around
#'marginalia--completion-metadata-get)))
+ (advice-add #'completion-metadata-get :before-until
#'marginalia--completion-metadata-get)))
;;;###autoload
(defun marginalia-set-command-annotation (cmd ann)
- [elpa] externals/marginalia 69332ba 110/241: fix hex code formatting, (continued)
- [elpa] externals/marginalia 69332ba 110/241: fix hex code formatting, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia d0c4e41 111/241: marginalia--field: fix nil handling, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 7d9c6aa 117/241: binding hash: specify larger initial size, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia b69be18 119/241: marginalia-annotate-variable: add local indicator, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 5802a5d 118/241: readme: configuration example for selectrum refresh after marginalia-cycle, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia cf9f411 125/241: marginalia: always run annotators in the original window context, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia c574a26 054/241: more colors!, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2b85b73 130/241: fix marginalia--full-candidate, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 3ec73cd 138/241: Merry Christmas, MELPA!, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 5129917 150/241: fix readme, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2f849d8 013/241: Simplify marginalia--completion-metadata-get,
Stefan Monnier <=
- [elpa] externals/marginalia c97911b 021/241: All classifiers from Embark have been imported, remove TODO, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 0cb98a0 023/241: Remove default value from prompt before matching, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 7fe8f71 027/241: improve buffer annotation formatting, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 4ba9804 031/241: Fix bug: file annotations were only shown for current directory, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 78023eb 038/241: update readme, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia b6d2e22 037/241: fix typo, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 472b47a 041/241: add comment to marginalia-toggle-annotators, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 85a2693 053/241: marginalia-annotate-package: show package archive, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia dfbaa7f 061/241: marginalia-annotate-package: show installed status instead of archive, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 17d539c 059/241: whitespace and comment adjustments, Stefan Monnier, 2021/05/28