2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 029d7375580..5423f02046f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-06  Glenn Morris  <rgm@gnu.org>
+
+        * cus-edit.el (custom-comment-tag): Doc fix.
+        (custom-comment, custom-variable-value-create, custom-face):
+        Use face names sans -face suffix rather than aliases.
+
 2008-11-05  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc/calc.el (calc-quit): Use `window-full-width-p' to check
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index fb067451661..40d1e2ffdfb 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2544,7 +2544,7 @@ try matching its doc string against `custom-guess-doc-alist'."
            (push (widget-create-child-and-convert
                   widget 'item
                   :format "%{%t%}: "
-                  :sample-face 'custom-variable-tag-face
+                  :sample-face 'custom-variable-tag
                   :tag tag
                   :parent widget)
                  buttons)
@@ -2597,8 +2597,8 @@ try matching its doc string against `custom-guess-doc-alist'."
                     :action 'custom-tag-action
                     :help-echo "Change value of this option."
                     :mouse-down-action 'custom-tag-mouse-down-action
-                    :button-face 'custom-variable-button-face
-                    :sample-face 'custom-variable-tag-face
+                    :button-face 'custom-variable-button
+                    :sample-face 'custom-variable-tag
                     tag)
                    buttons)
              (insert " ")
@@ -3226,7 +3226,7 @@ Only match frames that support the specified face attributes.")
 
 (define-widget 'custom-face 'custom
   "Customize face."
-  :sample-face 'custom-face-tag-face
+  :sample-face 'custom-face-tag
   :help-echo "Set or reset this face."
   :documentation-property #'face-doc-string
   :value-create 'custom-face-value-create