--- a/lisp/packages/apropos.el	Mon Aug 13 09:26:04 2007 +0200
+++ b/lisp/packages/apropos.el	Mon Aug 13 09:26:39 2007 +0200
@@ -210,6 +210,7 @@
 			       (lambda (symbol)
 				 (or (fboundp symbol)
 				     (boundp symbol)
+				     (find-face symbol)
 				     (symbol-plist symbol))))))
   (apropos-print
    (or do-all apropos-do-all)
@@ -240,7 +241,18 @@
 		    (if (setq doc (symbol-plist symbol))
 			(if (eq (/ (length doc) 2) 1)
 			    (format "1 property (%s)" (car doc))
-			  (concat (/ (length doc) 2) " properties")))))
+			  (concat (/ (length doc) 2) " properties")))
+		    (if (get symbol 'widget-type)
+			(if (setq doc (documentation-property
+				       symbol 'widget-documentation t))
+			    (substring doc 0
+				       (string-match "\n" doc))
+			  "(not documented)"))
+		    (if (find-face symbol)
+			(if (setq doc (face-doc-string symbol))
+			    (substring doc 0
+				       (string-match "\n" doc))
+			  "(not documented)"))))
 	 (setq p (cdr p)))))
    nil))
 
@@ -559,8 +571,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