[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia 7608acbe6f: Fix mutual recursion issue (Fix
From: |
ELPA Syncer |
Subject: |
[elpa] externals/marginalia 7608acbe6f: Fix mutual recursion issue (Fix #123) |
Date: |
Mon, 10 Jan 2022 17:57:43 -0500 (EST) |
branch: externals/marginalia
commit 7608acbe6f8cca3c484d05b5d21d27319ba1ed4f
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Fix mutual recursion issue (Fix #123)
Marginalia redefined the `annotation-function` in terms of the
`affixation-function` even if the `affixation-function` was not provided by
Marginalia.
---
marginalia.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index 7a927a2329..c2e70b7431 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -1062,10 +1062,10 @@ PROP is the property which is looked up."
(pcase prop
('annotation-function
;; We do want the advice triggered for `completion-metadata-get'.
- ;; Return wrapper around the more general `affixation-function'.
- (when-let (aff (completion-metadata-get metadata 'affixation-function))
+ (when-let* ((cat (completion-metadata-get metadata 'category))
+ (annotator (marginalia--annotator cat)))
(lambda (cand)
- (let ((ann (caddar (funcall aff (list cand)))))
+ (let ((ann (caddar (marginalia--affixate metadata annotator (list
cand)))))
(and (not (equal ann "")) ann)))))
('affixation-function
;; We do want the advice triggered for `completion-metadata-get'.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/marginalia 7608acbe6f: Fix mutual recursion issue (Fix #123),
ELPA Syncer <=