[elpa] externals/marginalia 51f7509 184/241: Fix #57 - protect marginalia--symbol-class equality check

[Stefan Monnier]

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

    Fix #57 - protect marginalia--symbol-class equality check
---
 marginalia.el | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/marginalia.el b/marginalia.el
index 51d8d6a..d1cfcbc 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -395,20 +395,20 @@ t cl-type"
    (concat
     (when (fboundp s)
       (concat
-       (when (get s 'byte-obsolete-info) "o")
+       (and (get s 'byte-obsolete-info) "o")
        (cond
         ((commandp s) "c")
         ((eq (car-safe (symbol-function s)) 'macro) "m")
         (t "f"))
-       (when (marginalia--advised s) "!")))
+       (and (marginalia--advised s) "!")))
     (when (boundp s)
       (concat
-       (when (get s 'byte-obsolete-variable) "o")
-       (when (local-variable-if-set-p s) "l")
+       (and (get s 'byte-obsolete-variable) "o")
+       (and (local-variable-if-set-p s) "l")
        (if (custom-variable-p s) "u" "v")
-       (when (and (boundp s) (default-boundp s) (not (equal (symbol-value s) 
(default-value s)))) "*")))
-    (when (facep s) "a")
-    (when (and (fboundp 'cl-find-class) (cl-find-class s)) "t"))))
+       (and (ignore-errors (not (equal (symbol-value s) (default-value s)))) 
"*")))
+    (and (facep s) "a")
+    (and (fboundp 'cl-find-class) (cl-find-class s) "t"))))
 
 (defun marginalia--function-doc (sym)
   "Documentation string of function SYM."