From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 14 Aug 2024 12:47:40 +0000 (-0400)
Subject: Fix 'apropos-library' for 'define-symbol-props'
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e91542ec210dcc0302fe13b0f08cccdb2f058baf;p=emacs.git

Fix 'apropos-library' for 'define-symbol-props'

* lisp/apropos.el (apropos-library): Sanitize data to avoid
signaling errors when 'define-symbol-props' is seen.  (Bug#72616)

(cherry picked from commit bfe07eca5981fe80ddc8a54b18dd9340ad5ec2be)
---

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 6c6cd0b593d..0655fecd0e8 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -734,7 +734,10 @@ the output includes key-bindings of commands."
         ;; FIXME: Print information about each individual method: both
         ;; its docstring and specializers (bug#21422).
         ('cl-defmethod (push (cadr x) provides))
-	(_ (push (or (cdr-safe x) x) symbols))))
+        ;; FIXME: Add extension point (bug#72616).
+	(_ (let ((sym (or (cdr-safe x) x)))
+	     (and sym (symbolp sym)
+	          (push sym symbols))))))
     (let ((apropos-pattern "") ;Dummy binding for apropos-symbols-internal.
           (text
            (concat