diff lispref/display.texi @ 82073:38a46faaf8c1

Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 59-69) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 237-238) - Update from CVS 2007-07-23 Stefan Monnier <[e-mail]> * lisp/ses.el (ses-cleanup): Prevent Emacs from spuriously checking if the underlying file is uptodate. 2007-07-17 Dan Nicolaescu <[e-mail]> * lisp/vc.el: Add more info about the vc-registered function. 2007-07-15 Richard Stallman <[e-mail]> * lisp/kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys. * lisp/tutorial.el (tutorial--find-changed-keys): Handle C-x specially like ESC. 2007-07-15 Aaron Hawley <[e-mail]> * lisp/tar-mode.el (tar-get-descriptor): No error for zero-length file. 2007-07-21 Reiner Steib <[e-mail]> * lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc string. 2007-07-16 Katsumi Yamaoka <[e-mail]> * lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces. 2007-07-16 Richard Stallman <[e-mail]> * lispref/display.texi (Defining Faces): Fix previous change. 2007-07-20 Eli Zaretskii <[e-mail]> * src/w32proc.c (IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define if not defined. 2007-07-18 Jason Rumney <[e-mail]> * src/w32proc.c (w32_executable_type): Handle 64 bit executables. Revision: [e-mail]/emacs--devo--0--patch-823

--- a/lispref/display.texi	Mon Jul 23 21:32:32 2007 +0000
+++ b/lispref/display.texi	Tue Jul 24 01:21:32 2007 +0000
@@ -1760,10 +1760,10 @@
 @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
+When you evaluate a @code{defface} 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.
+exactly what the @code{defface} 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