Merge changes from emacs-23 branch.

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 04e74667bc3..02c2969242f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2010-07-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.h (x_menubar_window_to_frame): Second parameter is XEvent*.
+
+        * xterm.c (handle_one_xevent): Pass event to x_menubar_window_to_frame.
+
+        * xmenu.c (x_activate_menubar): Revert previous fix for Bug#6499,
+        i.e. don't put back ButtonRelease (Bug#6608).
+
+        * xfns.c (x_menubar_window_to_frame): Take XEvent as second parameter
+        instead of Window.  Call xg_event_is_for_menubar when
+        USE_GTK (Bug#6499).
+
+        * gtkutil.h (xg_event_is_for_menubar): Declare.
+
+        * gtkutil.c (xg_event_is_for_menubar): New function (Bug#6499).
+
+2010-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (x_set_foreground_color): Fix setting the cursor color
+        when it's the same as the old foreground.  (Bug#6609)
+
 2010-07-16  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xmenu.c (free_frame_menubar): Only call x_set_window_size if