2 files changed, 9 insertions, 0 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 6a824f8deaf..5102e723566 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -2,6 +2,10 @@
 
         * control.texi (Handling Errors): Document `debug' in handler list.
 
+2007-07-10  Richard Stallman  <rms@gnu.org>
+
+        * display.texi (Defining Faces): Explain C-M-x feature for defface.
+
 2007-07-09  Richard Stallman  <rms@gnu.org>
 
         * files.texi (Magic File Names): Rewrite previous change.
diff --git a/lispref/display.texi b/lispref/display.texi
index 664ad1d2c15..f4d7a5dbcdb 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1760,6 +1760,11 @@ When @code{defface} executes, it defines the face according to
 @var{spec}, then uses any customizations that were read from the
 init file (@pxref{Init File}) to override that specification.
 
+When you evaluate a @code{defcustom} form with @kbd{C-M-x} in Emacs
+Lisp mode (@code{eval-defun}), a special feature of @code{eval-defun}
+overrides any customizations of the face.  This way, the face reflects
+exactly what the @code{defcustom} says.
+
 The purpose of @var{spec} is to specify how the face should appear on
 different kinds of terminals.  It should be an alist whose elements
 have the form @code{(@var{display} @var{atts})}.  Each element's