changeset 17417:c351a7e1880c

(apropos): Add support for faces, widgets, and user options. (apropos-print): Ditto.
author Richard M. Stallman <rms@gnu.org>
date Sat, 12 Apr 1997 18:49:35 +0000
parents c0c355e7934c
children 726a87ac1486
files lisp/apropos.el
diffstat 1 files changed, 21 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/apropos.el	Sat Apr 12 17:51:31 1997 +0000
+++ b/lisp/apropos.el	Sat Apr 12 18:49:35 1997 +0000
@@ -181,6 +181,7 @@
 			       (lambda (symbol)
 				 (or (fboundp symbol)
 				     (boundp symbol)
+				     (facep symbol)
 				     (symbol-plist symbol))))))
   (apropos-print
    (or do-all apropos-do-all)
@@ -202,7 +203,19 @@
 		      (setq doc (list (car properties)))
 		      (while (setq properties (cdr (cdr properties)))
 			(setq doc (cons (car properties) doc)))
-		      (mapconcat #'symbol-name (nreverse doc) " "))))
+		      (mapconcat #'symbol-name (nreverse doc) " "))
+		    (when (get symbol 'widget-type)
+		      (if (setq doc (documentation-property
+				     symbol 'widget-documentation t))
+			  (substring doc 0
+				     (string-match "\n" doc))
+			"(not documented)"))
+		    (when (facep symbol)
+		      (if (setq doc (documentation-property
+				     symbol 'face-documentation t))
+			  (substring doc 0
+				     (string-match "\n" doc))
+			"(not documented)"))))
 	 (setq p (cdr p)))))
    nil))
 
@@ -517,8 +530,13 @@
 				   "Macro"
 				 "Function"))
 			     do-keys)
-	  (apropos-print-doc 'describe-variable 2
-			     "Variable" do-keys)
+	  (if (get symbol 'custom-type)
+	      (apropos-print-doc 'customize-variable-other-window 2
+				 "User Option" do-keys)
+	    (apropos-print-doc 'describe-variable 2
+			       "Variable" do-keys))
+	  (apropos-print-doc 'customize-face-other-window 5 "Face" do-keys)
+	  (apropos-print-doc 'widget-browse-other-window 4 "Widget" do-keys)
 	  (apropos-print-doc 'apropos-describe-plist 3
 			     "Plist" nil)))))
   (prog1 apropos-accumulator