From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 22 Feb 2007 23:31:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.94~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72a3a66a93f6ea13bd535888e45fc84b0379418c;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a62c8ea9da7..fd8a443ca24 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2007-02-22  Jason Rumney  <jasonr@gnu.org>
 
+	* w32fns.c (menu_bar_in_use): New flag.
+	(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.