diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/apropos.el | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3357b5e5340..b97c37f1f9b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-03-26 Stefan Monnier <monnier@iro.umontreal.ca> + + * apropos.el (apropos-command): Include macros. + 2008-03-26 Glenn Morris <rgm@gnu.org> * calendar/cal-bahai.el: Require calendar, not cal-julian. diff --git a/lisp/apropos.el b/lisp/apropos.el index 0ca6248ea55..a2bbdce88ea 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -456,7 +456,10 @@ while a list of strings is used as a word list." (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 @@ while a list of strings is used as a word list." (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))) |