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, 12 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4694c984f2d..a707d884454 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -36,6 +36,13 @@
 
         * term.c: Include unistd.h only if HAVE_UNISTD_H.
 
+2007-07-11  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (LIBS): Include OLE32.
+
+        * w32fns.c (w32_msg_pump) <WM_EMACS_CREATEWINDOW>: Initialize COM.
+        (w32_msg_pump) <WM_DESTROY>: Uninitialize COM.
+
 2007-07-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lisp.h (struct Lisp_Hash_Table): Turn next_weak into a bare pointer.
@@ -1206,13 +1213,13 @@
         when popup menu finishes.
 
         * w32fns.c (menubar_in_use): New flag.
-        (w32_wnd_proc) [WM_INITMENU, WM_EXITMENULOOP, WM_TIMER, WM_COMMAND]:
+        (w32_wnd_proc) <WM_INITMENU, WM_EXITMENULOOP, WM_TIMER, WM_COMMAND>:
         Use it.
 
         * w32menu.c (Fx_popup_menu): Don't free menu strings here.
         (w32_menu_show): Do it here instead.
 
-        * w32fns.c (w32_wnd_proc) [WM_INITMENU]: Set menubar_active frame
+        * w32fns.c (w32_wnd_proc) <WM_INITMENU>: Set menubar_active frame
         parameter.
 
         * w32menu.c (current_popup_menu): Make available globally.
@@ -1220,7 +1227,7 @@
         menu event into the keyboard buffer.  Remove menu_command_in_progress.
 
         * w32fns.c (current_popup_menu): Use from w32menu.c.
-        (w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active
+        (w32_wnd_proc) <WM_EXITMENULOOP, WM_TIMER>: Use menubar_active
         and current_popup_menu to determine whether a menubar menu has
         been cancelled.
 
@@ -10331,7 +10338,7 @@
         * w32term.h (x_output): Add focus_state.
 
         * w32term.c (x_focus_changed, w32_detect_focus_change): New functions.
-        (w32_read_socket) [WM_SETFOCUS]: Call w32_detect_focus_change.
+        (w32_read_socket) <WM_SETFOCUS>: Call w32_detect_focus_change.
 
 2005-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -13624,7 +13631,7 @@
 
         * w32term.h (AppendMenuW_Proc): Move declaration from w32menu.c.
 
-        * w32fns.c (w32_wnd_proc) [WM_MEASUREITEM, WM_DRAWITEM]:
+        * w32fns.c (w32_wnd_proc) <WM_MEASUREITEM, WM_DRAWITEM>:
         Handle Unicode menu titles.
 
 2004-09-07  Kim F. Storm  <storm@cua.dk>