diff options
| author | Paul Eggert | 2011-09-21 10:48:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-21 10:48:19 -0700 |
| commit | 4c0078d4ab7fa8c234fa8098ec3a9686199edbff (patch) | |
| tree | 94584f6a647d7d9ab5da97842dcc37e75d6c03fe /src/xmenu.c | |
| parent | d311d28c3f8a3c43e6ef33d68b852c5ea7f13239 (diff) | |
| parent | e233ce558d12fdf9e0e69ea30c4558ec7477fea4 (diff) | |
| download | emacs-4c0078d4ab7fa8c234fa8098ec3a9686199edbff.tar.gz emacs-4c0078d4ab7fa8c234fa8098ec3a9686199edbff.zip | |
Merge from trunk.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index f7497955e93..eab25d709f6 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, |