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

3 files changed, 10 insertions, 2 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index c23d65d48e5..df2344dc3af 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -3,6 +3,12 @@
         * inc/sys/socket.h: Include winsock2.h and ws2tcpip.h instead
         of winsock.h.
 
+2007-07-11  Jason Rumney  <jasonr@gnu.org>
+
+        * gmake.defs (OLE32): New library to link.
+
+        * nmake.defs (OLE32): Likewise.
+
 2007-06-25  Jason Rumney  <jasonr@gnu.org>
 
         * cmdproxy.c (main): Set console codepages to "ANSI".
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 15ec2bf0ea3..c08ca32200f 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -176,8 +176,9 @@ MPR		= -lmpr
 SHELL32         = -lshell32
 USER32          = -luser32
 WSOCK32         = -lwsock32
-WINMM     = -lwinmm
+WINMM           = -lwinmm
 WINSPOOL        = -lwinspool
+OLE32           = -lole32
 
 ifdef NOOPT
 DEBUG_CFLAGS    = -DEMACSDEBUG
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 5f52bc18c62..03ae2f851fa 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -123,8 +123,9 @@ MPR		= mpr.lib
 SHELL32         = shell32.lib

 USER32          = user32.lib

 WSOCK32         = wsock32.lib

-WINMM     = winmm.lib

+WINMM           = winmm.lib

 WINSPOOL        = winspool.lib

+OLE32           = ole32.lib

 

 !ifdef NOOPT

 DEBUG_CFLAGS    = -DEMACSDEBUG