1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 23:10:47 -08:00

* xmenu.c (create_and_show_popup_menu): Just remove menu and return

if it failed to pop up (Gnome "show pointer on ctrl" option makes
menus fail to pop up).
This commit is contained in:
Jan Djärv 2005-03-24 18:53:43 +00:00
parent 04c769c2bd
commit ff18668fa0
2 changed files with 14 additions and 5 deletions

View file

@ -1,3 +1,9 @@
2005-03-24 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
if it failed to pop up (Gnome "show pointer on ctrl" option makes
menus fail to pop up).
2005-03-24 Stefan <monnier@iro.umontreal.ca>
* xdisp.c (get_next_display_element): Also use `\ ' & `\-' for latin-9.

View file

@ -2490,11 +2490,14 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
record_unwind_protect (pop_down_menu, make_save_value (menu, 0));
/* Set this to one. popup_widget_loop increases it by one, so it becomes
two. show_help_echo uses this to detect popup menus. */
popup_activated_flag = 1;
/* Process events that apply to the menu. */
popup_widget_loop (1, menu);
if (GTK_WIDGET_MAPPED (menu))
{
/* Set this to one. popup_widget_loop increases it by one, so it becomes
two. show_help_echo uses this to detect popup menus. */
popup_activated_flag = 1;
/* Process events that apply to the menu. */
popup_widget_loop (1, menu);
}
unbind_to (specpdl_count, Qnil);