*** empty log message ***

1 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 20e26952b17..f40fe219b10 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2006-11-05  Martin Rudalics  <rudalics@gmx.at>
+
+        * macmenu.c (Fmenu_or_popup_active_p): New function.
+        (syms_of_macmenu): Defsubr it.
+
+        * w32menu.c (Fmenu_or_popup_active_p): New function.
+        (syms_of_w32menu): Defsubr it.
+        (popup_activated_flag, popup_activated): Remove.
+
+        * xdisp.c (note_mouse_highlight) [HAVE_NTGUI]: Don't bother to
+        check popup_activated.
+
+        * xmenu.c (Fmenu_or_popup_active_p): New function.
+        (syms_of_xmenu): Defsubr it.
+
 2006-11-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * unexmacosx.c (malloc_cookie): Remove unused variable.