branch: externals/marginalia commit b5893884abeb6a355233edf54e0f63d04bc32ce2 Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Simplify marginalia-annotate-variable --- marginalia.el | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/marginalia.el b/marginalia.el index 08ee70c..70ae7c8 100644 --- a/marginalia.el +++ b/marginalia.el @@ -486,16 +486,16 @@ keybinding since CAND includes it." (when-let (sym (intern-soft cand)) (marginalia--fields ((marginalia--symbol-class sym) :face 'marginalia-type) - ((if (seq-find (lambda (r) (string-match-p r cand)) - marginalia-censor-variables) - "*****" - (let ((val (if (boundp sym) (symbol-value sym) 'unbound)) - (print-escape-newlines t) - (print-escape-control-characters t) - (print-escape-multibyte t) - (print-level 10) - (print-length marginalia-truncate-width)) - (prin1-to-string val))) + ((cond + ((not (boundp sym)) "<unbound>") + ((seq-find (lambda (r) (string-match-p r cand)) marginalia-censor-variables) "*****") + (t (let ((val (symbol-value sym)) + (print-escape-newlines t) + (print-escape-control-characters t) + (print-escape-multibyte t) + (print-level 10) + (print-length marginalia-truncate-width)) + (prin1-to-string val)))) :truncate (/ marginalia-truncate-width 2) :face 'marginalia-variable) ((documentation-property sym 'variable-documentation) :truncate marginalia-truncate-width :face 'marginalia-documentation))))