aboutsummaryrefslogtreecommitdiffstats
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorChong Yidong2009-11-08 00:14:30 +0000
committerChong Yidong2009-11-08 00:14:30 +0000
commitc0df13a6e3e1cf0d5bd2c3aac1be059b6ab2dd24 (patch)
treeea6e859af590868a03555cc5ec9984b127a5ca38 /src/xmenu.c
parent76c5acad543c5d4f0bfcafc6e2d89ff54cf9279f (diff)
downloademacs-c0df13a6e3e1cf0d5bd2c3aac1be059b6ab2dd24.tar.gz
emacs-c0df13a6e3e1cf0d5bd2c3aac1be059b6ab2dd24.zip
* xmenu.c (Fx_popup_menu): Hide any tooltip before opening a menu.
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 080930a4e78..d8493283440 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -502,6 +502,9 @@ no quit occurs and `x-popup-menu' returns nil. */)
502 } 502 }
503 503
504#ifdef HAVE_MENUS 504#ifdef HAVE_MENUS
505 /* Hide a previous tip, if any. */
506 Fx_hide_tip ();
507
505 /* Display them in a menu. */ 508 /* Display them in a menu. */
506 BLOCK_INPUT; 509 BLOCK_INPUT;
507 510
@@ -1805,6 +1808,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp)
1805 1808
1806 /* Display the menu. */ 1809 /* Display the menu. */
1807 gtk_widget_show_all (menu); 1810 gtk_widget_show_all (menu);
1811
1808 gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 1812 gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i,
1809 timestamp > 0 ? timestamp : gtk_get_current_event_time()); 1813 timestamp > 0 ? timestamp : gtk_get_current_event_time());
1810 1814