Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 55-58)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 235-236)

   - Update from CVS

2007-07-13  Dan Nicolaescu  <dann@ics.uci.edu>

   * lisp/replace.el (match): Use yellow1 instead of yellow.

   * lisp/progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of
   red.

   * lisp/pcvs-info.el (cvs-unknown): Likewise.

2007-07-10  Richard M. Stallman  <rms@gnu.org>

   * lisp/emacs-lisp/lisp-mode.el (eval-defun):
   Explain special handling of `defface'.

2007-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
   (gnus-server-closed-face, gnus-server-denied-face)
   (gnus-server-offline-face): Remove variable.
   (gnus-server-font-lock-keywords): Use faces that are not aliases.

   * lisp/gnus/mm-util.el (mm-decode-coding-string, mm-encode-coding-string)
   (mm-decode-coding-region, mm-encode-coding-region): Don't modify string
   if the coding-system argument is nil for XEmacs.

   * lisp/gnus/nnrss.el (nnrss-compatible-encoding-alist): Inherit the value of
   mm-charset-override-alist.

   * lisp/gnus/rfc2047.el: Don't require base64; require rfc2045 for the function
   rfc2045-encode-string.
   (rfc2047-encode-parameter): Use rfc2045-encode-string to quote or not
   to quote the parameter value.

2007-07-10  Richard M. Stallman  <rms@gnu.org>

   * lispref/display.texi (Defining Faces): Explain C-M-x feature for defface.

2007-07-11  Jason Rumney  <jasonr@gnu.org>

   * nt/gmake.defs (OLE32): New library to link.

   * nt/nmake.defs (OLE32): Likewise.

2007-07-11  Jason Rumney  <jasonr@gnu.org>

   * src/makefile.w32-in (LIBS): Include OLE32.

   * src/w32fns.c (w32_msg_pump) <WM_EMACS_CREATEWINDOW>: Initialize COM.
   (w32_msg_pump) <WM_DESTROY>: Uninitialize COM.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-812

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