emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/marginalia 2437a6f 230/241: marginalia-cycle: Check for


From: Stefan Monnier
Subject: [elpa] externals/marginalia 2437a6f 230/241: marginalia-cycle: Check for affixation-function
Date: Fri, 28 May 2021 20:49:33 -0400 (EDT)

branch: externals/marginalia
commit 2437a6f0abada9de122c4ac3b22bf26deb194185
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    marginalia-cycle: Check for affixation-function
---
 marginalia.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/marginalia.el b/marginalia.el
index 797121d..4b1eb39 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -812,8 +812,10 @@ Remember `this-command' for 
`marginalia-classify-by-command-name'."
           ;; When the builtin annotator is selected and no builtin function is 
available, skip to
           ;; the next annotator. Note that we cannot use 
`completion-metadata-get' to access the
           ;; metadata since we must bypass the 
`marginalia--completion-metadata-get' advice.
-          (when (and (eq (cadr cat) 'builtin) (not (alist-get 
'annotation-function metadata))
-                     (setcdr cat (append (cddr cat) (list (cadr cat))))))
+          (when (and (eq (cadr cat) 'builtin)
+                     (not (assq 'annotation-function metadata))
+                     (not (assq 'affixation-function metadata)))
+            (setcdr cat (append (cddr cat) (list (cadr cat)))))
           (message "Marginalia: Use annotator `%s' for category `%s'" (cadr 
cat) (car cat))))
     (user-error "Marginalia: No active minibuffer")))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]