[Emacs-diffs] Changes to emacs/src/ChangeLog,v [EMACS_22_BASE]

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Jason Rumney <jasonr>   07/07/12 10:43:47

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.5651.2.40
retrieving revision 1.5651.2.41
diff -u -b -r1.5651.2.40 -r1.5651.2.41
--- ChangeLog   11 Jul 2007 14:43:07 -0000      1.5651.2.40
+++ ChangeLog   12 Jul 2007 10:43:46 -0000      1.5651.2.41
@@ -703,13 +703,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.
@@ -717,7 +717,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.
 
@@ -9827,7 +9827,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  <address@hidden>
 
@@ -13120,7 +13120,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  <address@hidden>