[Emacs-diffs] Changes to emacs/lisp/apropos.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/26 03:31:44

Index: apropos.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/apropos.el,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- apropos.el  8 Jan 2008 20:44:51 -0000       1.124
+++ apropos.el  26 Mar 2008 03:31:41 -0000      1.125
@@ -456,7 +456,10 @@
     (setq apropos-accumulator
          (apropos-internal apropos-regexp
                            (or var-predicate
-                               (if do-all 'functionp 'commandp))))
+                                ;; We used to use `functionp' here, but this
+                                ;; rules out macros.  `fboundp' rules in
+                                ;; keymaps, but it seems harmless.
+                               (if do-all 'fboundp 'commandp))))
     (let ((tem apropos-accumulator))
       (while tem
        (if (or (get (car tem) 'apropos-inhibit)
@@ -470,7 +473,7 @@
                   (setq symbol (car p))
                   (setq score (apropos-score-symbol symbol))
                   (unless var-predicate
-                    (if (functionp symbol)
+                    (if (fboundp symbol)
                         (if (setq doc (documentation symbol t))
                             (progn
                               (setq score (+ score (apropos-score-doc doc)))