Use proper faces in apropos.el.

* lisp/apropos.el (apropos-symbol, apropos-keybinding, apropos-label)
(apropos-property, apropos-function-button)
(apropos-variable-button, apropos-misc-button): New faces.
(apropos-symbol-face, apropos-keybinding-face)
(apropos-label-face, apropos-property-face, apropos-match-face):
Variables removed.
(apropos-library-button, apropos-format-plist, apropos-print)
(apropos-print-doc, apropos-describe-plist): Callers changed.

Fixes: debbugs:8396

3 files changed, 66 insertions, 46 deletions

diff --git a/etc/NEWS b/etc/NEWS
index c4f89ab4a3b..fcf9fc9397e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -74,6 +74,15 @@ character when doing minibuffer filename prompts.
 
 * Changes in Specialized Modes and Packages in Emacs 24.2
 
+** Apropos
+
+*** The faces used by Apropos are now directly customizable.
+These faces are named `apropos-symbol', `apropos-keybinding', and so on;
+see the `apropos' Custom group for details.
+
+**** The old options whose values specified faces to use were removed
+(i.e. `apropos-symbol-face', `apropos-keybinding-face', etc.).
+
 ** Customize
 
 *** `custom-reset-button-menu' now defaults to t.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bef7214456..173b2345c58 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,14 @@
 
         * apropos.el (apropos-read-pattern): Make prompt less cryptic.
         Fix word list splitting (Bug#11132).
+        (apropos-symbol, apropos-keybinding, apropos-label)
+        (apropos-property, apropos-function-button)
+        (apropos-variable-button, apropos-misc-button): New faces.
+        (apropos-symbol-face, apropos-keybinding-face)
+        (apropos-label-face, apropos-property-face, apropos-match-face):
+        Variables removed (Bug#8396).
+        (apropos-library-button, apropos-format-plist, apropos-print)
+        (apropos-print-doc, apropos-describe-plist): Callers changed.
 
 2012-04-23  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 25163dcab99..f5373b38682 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -85,35 +85,48 @@ include key-binding information in its output."
   :group 'apropos
   :type 'boolean)
 
+(defface apropos-symbol
+  '((t (:inherit bold)))
+  "Face for the symbol name in Apropos output."
+  :group 'apropos
+  :version "24.2")
 
-(defcustom apropos-symbol-face 'bold
-  "Face for symbol name in Apropos output, or nil for none."
+(defface apropos-keybinding
+  '((t (:inherit underline)))
+  "Face for lists of keybinding in Apropos output."
   :group 'apropos
-  :type 'face)
+  :version "24.2")
 
-(defcustom apropos-keybinding-face 'underline
-  "Face for lists of keybinding in Apropos output, or nil for none."
+(defface apropos-property
+  '((t (:inherit font-lock-builtin-face)))
+  "Face for property name in apropos output, or nil for none."
   :group 'apropos
-  :type 'face)
+  :version "24.2")
 
-(defcustom apropos-label-face '(italic)
-  "Face for label (`Command', `Variable' ...) in Apropos output.
-A value of nil means don't use any special font for them, and also
-turns off mouse highlighting."
+(defface apropos-function-button
+  '((t (:inherit (font-lock-function-name-face button))))
+  "Button face indicating a function, macro, or command in Apropos."
   :group 'apropos
-  :type 'face)
+  :version "24.2")
 
-(defcustom apropos-property-face 'bold-italic
-  "Face for property name in apropos output, or nil for none."
+(defface apropos-variable-button
+  '((t (:inherit (font-lock-variable-name-face button))))
+  "Button face indicating a variable in Apropos."
   :group 'apropos
-  :type 'face)
+  :version "24.2")
+
+(defface apropos-misc-button
+  '((t (:inherit (font-lock-constant-face button))))
+  "Button face indicating a miscellaneous object type in Apropos."
+  :group 'apropos
+  :version "24.2")
 
 (defcustom apropos-match-face 'match
   "Face for matching text in Apropos documentation/value, or nil for none.
 This applies when you look for matches in the documentation or variable value
 for the pattern; the part that matches gets displayed in this font."
   :group 'apropos
-  :type 'face)
+  :version "24.2")
 
 (defcustom apropos-sort-by-scores nil
   "Non-nil means sort matches by scores; best match is shown first.
@@ -196,7 +209,7 @@ term, and the rest of the words are alternative terms.")
 ;;; Button types used by apropos
 
 (define-button-type 'apropos-symbol
-  'face apropos-symbol-face
+  'face 'apropos-symbol
   'help-echo "mouse-2, RET: Display more help on this symbol"
   'follow-link t
   'action #'apropos-symbol-button-display-help)
@@ -210,7 +223,7 @@ term, and the rest of the words are alternative terms.")
 (define-button-type 'apropos-function
   'apropos-label "Function"
   'apropos-short-label "f"
-  'face '(font-lock-function-name-face button)
+  'face 'apropos-function-button
   'help-echo "mouse-2, RET: Display more help on this function"
   'follow-link t
   'action (lambda (button)
@@ -219,7 +232,7 @@ term, and the rest of the words are alternative terms.")
 (define-button-type 'apropos-macro
   'apropos-label "Macro"
   'apropos-short-label "m"
-  'face '(font-lock-function-name-face button)
+  'face 'apropos-function-button
   'help-echo "mouse-2, RET: Display more help on this macro"
   'follow-link t
   'action (lambda (button)
@@ -228,7 +241,7 @@ term, and the rest of the words are alternative terms.")
 (define-button-type 'apropos-command
   'apropos-label "Command"
   'apropos-short-label "c"
-  'face '(font-lock-function-name-face button)
+  'face 'apropos-function-button
   'help-echo "mouse-2, RET: Display more help on this command"
   'follow-link t
   'action (lambda (button)
@@ -242,7 +255,7 @@ term, and the rest of the words are alternative terms.")
 (define-button-type 'apropos-variable
   'apropos-label "Variable"
   'apropos-short-label "v"
-  'face '(font-lock-variable-name-face button)
+  'face 'apropos-variable-button
   'help-echo "mouse-2, RET: Display more help on this variable"
   'follow-link t
   'action (lambda (button)
@@ -260,7 +273,7 @@ term, and the rest of the words are alternative terms.")
 (define-button-type 'apropos-group
   'apropos-label "Group"
   'apropos-short-label "g"
-  'face '(font-lock-builtin-face button)
+  'face 'apropos-misc-button
   'help-echo "mouse-2, RET: Display more help on this group"
   'follow-link t
   'action (lambda (button)
@@ -270,7 +283,7 @@ term, and the rest of the words are alternative terms.")
 (define-button-type 'apropos-widget
   'apropos-label "Widget"
   'apropos-short-label "w"
-  'face '(font-lock-builtin-face button)
+  'face 'apropos-misc-button
   'help-echo "mouse-2, RET: Display more help on this widget"
   'follow-link t
   'action (lambda (button)
@@ -279,7 +292,7 @@ term, and the rest of the words are alternative terms.")
 (define-button-type 'apropos-plist
   'apropos-label "Properties"
   'apropos-short-label "p"
-  'face '(font-lock-keyword-face button)
+  'face 'apropos-misc-button
   'help-echo "mouse-2, RET: Display more help on this plist"
   'follow-link t
   'action (lambda (button)
@@ -587,7 +600,7 @@ Returns list of symbols and documentation found."
     (let ((name (copy-sequence (symbol-name sym))))
       (make-text-button name nil
                         'type 'apropos-library
-                        'face apropos-symbol-face
+                        'face 'apropos-symbol
                         'apropos-symbol name)
       name)))
 
@@ -837,9 +850,8 @@ Returns list of symbols and documentation found."
     (while pl
       (setq p (format "%s %S" (car pl) (nth 1 pl)))
       (if (or (not compare) (string-match apropos-regexp p))
-          (if apropos-property-face
-              (put-text-property 0 (length (symbol-name (car pl)))
-                                 'face apropos-property-face p))
+          (put-text-property 0 (length (symbol-name (car pl)))
+                             'face 'apropos-property p)
         (setq p nil))
       (if p
           (progn
@@ -1031,10 +1043,7 @@ If non-nil TEXT is a string that will be printed as a heading."
           (insert-text-button (symbol-name symbol)
                               'type 'apropos-symbol
                               'skip apropos-multi-type
-                              ;; Can't use default, since user may have
-                              ;; changed the variable!
-                              ;; Just say `no' to variables containing faces!
-                              'face apropos-symbol-face)
+                              'face 'apropos-symbol)
           (if (and (eq apropos-sort-by-scores 'verbose)
                    (cadr apropos-item))
               (insert " (" (number-to-string (cadr apropos-item)) ") "))
@@ -1072,18 +1081,16 @@ If non-nil TEXT is a string that will be printed as a heading."
                          (setq key (condition-case ()
                                        (key-description key)
                                      (error)))
-                         (if apropos-keybinding-face
-                             (put-text-property 0 (length key)
-                                                'face apropos-keybinding-face
-                                                key))
+                         (put-text-property 0 (length key)
+                                            'face 'apropos-keybinding
+                                            key)
                          key)
                        item ", "))
                    (insert "M-x ... RET")
-                   (when apropos-keybinding-face
-                     (put-text-property (- (point) 11) (- (point) 8)
-                                        'face apropos-keybinding-face)
-                     (put-text-property (- (point) 3) (point)
-                                        'face apropos-keybinding-face))))
+                   (put-text-property (- (point) 11) (- (point) 8)
+                                      'face 'apropos-keybinding)
+                   (put-text-property (- (point) 3) (point)
+                                      'face 'apropos-keybinding)))
             (terpri))
           (apropos-print-doc 2
                              (if (commandp symbol)
@@ -1128,9 +1135,6 @@ If non-nil TEXT is a string that will be printed as a heading."
                  (format "<%s>" (button-type-get type 'apropos-short-label))
                (button-type-get type 'apropos-label))
              'type type
-             ;; Can't use the default button face, since user may have changed the
-             ;; variable!  Just say `no' to variables containing faces!
-             'face (append button-face apropos-label-face)
              'apropos-symbol (car apropos-item))
             (insert (if apropos-compact-layout " " ": ")))
 
@@ -1177,9 +1181,8 @@ If non-nil TEXT is a string that will be printed as a heading."
     (princ "Symbol ")
     (prin1 symbol)
     (princ "'s plist is\n (")
-    (if apropos-symbol-face
-        (put-text-property (+ (point-min) 7) (- (point) 14)
-                           'face apropos-symbol-face))
+    (put-text-property (+ (point-min) 7) (- (point) 14)
+                       'face 'apropos-symbol)
     (insert (apropos-format-plist symbol "\n  "))
     (princ ")")))