Mercurial > emacs

changeset 93233:f86b9c0c87ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(apropos-command): Include macros.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 26 Mar 2008 03:31:42 +0000
parents 32f5a7f03231
children 3f711cd30ffa
files lisp/ChangeLog lisp/apropos.el
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Mar 26 03:26:43 2008 +0000
+++ b/lisp/ChangeLog	Wed Mar 26 03:31:42 2008 +0000
@@ -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.
--- a/lisp/apropos.el	Wed Mar 26 03:26:43 2008 +0000
+++ b/lisp/apropos.el	Wed Mar 26 03:31:42 2008 +0000
@@ -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)))