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

1 files changed, 14 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 526d7d021e8..6a568afe055 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -31,6 +31,15 @@
 
         * subr.el (when, unless): Doc fix.
 
+2007-07-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * replace.el (match): Use yellow1 instead of yellow.
+
+        * progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of
+        red. 
+
+        * pcvs-info.el (cvs-unknown): Likewise.
+
 2007-07-13  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (install-lisp-SH, install-lisp-CMD): New targets.
@@ -140,6 +149,11 @@
 
         * menu-bar.el (vc-menu-map): New defalias.
 
+2007-07-10  Richard Stallman  <rms@gnu.org>
+
+        * emacs-lisp/lisp-mode.el (eval-defun):
+        Explain special handling of `defface'.
+
 2007-07-10  Jim Meyering  <jim@meyering.net>  (tiny change)
 
         * emacs-lisp/copyright.el (copyright-current-gpl-version): Set to 3.