mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

(apropos-command): Include macros.

Browse source
This commit is contained in:
Stefan Monnier 2008-03-26 03:31:42 +00:00
parent 26f435507b
commit 554fde6ed7
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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> 2008-03-26 Glenn Morris <rgm@gnu.org>
* calendar/cal-bahai.el: Require calendar, not cal-julian. * calendar/cal-bahai.el: Require calendar, not cal-julian.

7
lisp/apropos.el
View file

@ -456,7 +456,10 @@ while a list of strings is used as a word list."
(setq apropos-accumulator (setq apropos-accumulator
(apropos-internal apropos-regexp (apropos-internal apropos-regexp
(or var-predicate (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)) (let ((tem apropos-accumulator))
(while tem (while tem
(if (or (get (car tem) 'apropos-inhibit) (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 symbol (car p))
(setq score (apropos-score-symbol symbol)) (setq score (apropos-score-symbol symbol))
(unless var-predicate (unless var-predicate
(if (functionp symbol) (if (fboundp symbol)
(if (setq doc (documentation symbol t)) (if (setq doc (documentation symbol t))
(progn (progn
(setq score (+ score (apropos-score-doc doc))) (setq score (+ score (apropos-score-doc doc)))