# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1172184691 0
# Node ID 0cb5c0c1f9cc94186929c9a9bfeb1beab149e319
# Parent  59abcab48ea27db55e70199b91faea802320c6de
*** empty log message ***

diff -r 59abcab48ea2 -r 0cb5c0c1f9cc src/ChangeLog
--- a/src/ChangeLog	Thu Feb 22 22:50:15 2007 +0000
+++ b/src/ChangeLog	Thu Feb 22 22:51:31 2007 +0000
@@ -1,3 +1,16 @@
+2007-02-22  Jason Rumney  <jasonr@gnu.org>
+
+	* w32menu.c (current_popup_menu): Make available globally.
+	(menubar_selection_callback): Free menu strings before pushing the
+	menu event into the keyboard buffer.  Remove
+	menu_command_in_progress.
+
+	* w32fns.c (current_popup_menu): Use from w32menu.c.
+	(w32_wnd_proc): Use menubar_active and current_popup_menu to
+	determine whether a menubar menu has been cancelled.
+
+	* w32term.h (w32_output): Remove menu_command_in_progress.
+
 2007-02-22  Kim F. Storm  <storm@cua.dk>
 
 	* dispnew.c (update_frame, update_single_window): Set force_p here if