apropos-library: Skip obvious duplicates; don't error on generics

* lisp/apropos.el (apropos-library): Skip "was an autoload"
entries, to avoid obvious duplicates.  For each cl-defmethod
entry, take just its function symbol (bug#21422).

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 36a729a34ab200cddcee1f68c295b0c966a338dd..f1656859639797eeb7748c63482ac81749b005b9 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -676,6 +676,10 @@ the output includes key-bindings of commands."
        ;; (autoload (push (cdr x) autoloads))
        (`require (push (cdr x) requires))
        (`provide (push (cdr x) provides))
+        (`t nil) ; Skip "was an autoload" entries.
+        ;; FIXME: Print information about each indivial method: both
+        ;; its docstring and specializers (bug#21422).
+        (`cl-defmethod (push (cadr x) provides))
        (_ (push (or (cdr-safe x) x) symbols))))
     (let ((apropos-pattern "")) ;Dummy binding for apropos-symbols-internal.
       (apropos-symbols-internal