aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xmenu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c6238701301..d09c970bc03 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1303,7 +1303,7 @@
1303 underline, overline, and strike-through. 1303 underline, overline, and strike-through.
1304 (ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to 1304 (ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to
1305 ns_draw_text_decoration. Change treatment of cursor drawing to 1305 ns_draw_text_decoration. Change treatment of cursor drawing to
1306 accomomdate underlining, etc. 1306 accommodate underlining, etc.
1307 1307
13082011-07-28 Eli Zaretskii <eliz@gnu.org> 13082011-07-28 Eli Zaretskii <eliz@gnu.org>
1309 1309
diff --git a/src/xmenu.c b/src/xmenu.c
index cf58e85af10..7fcd2ad3724 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -742,7 +742,7 @@ menu_highlight_callback (GtkWidget *widget, gpointer call_data)
742 /* If popup_activated_flag is greater than 1 we are in a popup menu. 742 /* If popup_activated_flag is greater than 1 we are in a popup menu.
743 Don't pass the frame to show_help_event for those. 743 Don't pass the frame to show_help_event for those.
744 Passing frame creates an Emacs event. As we are looping in 744 Passing frame creates an Emacs event. As we are looping in
745 popup_widget_loop, it won't be handeled. Passing NULL shows the tip 745 popup_widget_loop, it won't be handled. Passing NULL shows the tip
746 directly without using an Emacs event. This is what the Lucid code 746 directly without using an Emacs event. This is what the Lucid code
747 does below. */ 747 does below. */
748 show_help_event (popup_activated_flag <= 1 ? cb_data->cl_data->f : NULL, 748 show_help_event (popup_activated_flag <= 1 ? cb_data->cl_data->f : NULL,