Mercurial > emacs
comparison src/xmenu.c @ 83537:c19f348befac
Fix F10 behaviour. (Reported by Bernard Adrian.)
* src/xmenu.c (Fx_menu_bar_open) [USE_X_TOOLKIT, USE_GTK]:
Rename from Fmenu_bar_open.
(syms_of_xmenu): Update defsubr.
* lisp/menu-bar.el (menu-bar-open): New function.
Bind it to f10.
* lisp/term/x-win.el: Don't bind f10.
* lisp/tmm.el: Remove autoload binding for f10.
* lisp/ldefs-boot.el: Regenerate.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-577
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 29 Jul 2006 20:57:26 +0000 |
parents | 46b1096093f5 |
children | 2d56e13fd23d |
comparison
equal
deleted
inserted
replaced
83536:0014f454c421 | 83537:c19f348befac |
---|---|
1308 | 1308 |
1309 x_dispatch_event (&event, event.xany.display); | 1309 x_dispatch_event (&event, event.xany.display); |
1310 } | 1310 } |
1311 } | 1311 } |
1312 | 1312 |
1313 DEFUN ("menu-bar-open", Fmenu_bar_open, Smenu_bar_open, 0, 1, "i", | 1313 DEFUN ("x-menu-bar-open", Fx_menu_bar_open, Sx_menu_bar_open, 0, 1, "i", |
1314 doc: /* Start key navigation of the menu bar in FRAME. | 1314 doc: /* Start key navigation of the menu bar in FRAME. |
1315 This initially opens the first menu bar item and you can then navigate with the | 1315 This initially opens the first menu bar item and you can then navigate with the |
1316 arrow keys, select a menu entry with the return key or cancel with the | 1316 arrow keys, select a menu entry with the return key or cancel with the |
1317 escape key. If FRAME has no menu bar this function does nothing. | 1317 escape key. If FRAME has no menu bar this function does nothing. |
1318 | 1318 |
1387 } | 1387 } |
1388 #endif /* USE_X_TOOLKIT */ | 1388 #endif /* USE_X_TOOLKIT */ |
1389 | 1389 |
1390 | 1390 |
1391 #ifdef USE_GTK | 1391 #ifdef USE_GTK |
1392 DEFUN ("menu-bar-open", Fmenu_bar_open, Smenu_bar_open, 0, 1, "i", | 1392 DEFUN ("x-menu-bar-open", Fx_menu_bar_open, Sx_menu_bar_open, 0, 1, "i", |
1393 doc: /* Start key navigation of the menu bar in FRAME. | 1393 doc: /* Start key navigation of the menu bar in FRAME. |
1394 This initially opens the first menu bar item and you can then navigate with the | 1394 This initially opens the first menu bar item and you can then navigate with the |
1395 arrow keys, select a menu entry with the return key or cancel with the | 1395 arrow keys, select a menu entry with the return key or cancel with the |
1396 escape key. If FRAME has no menu bar this function does nothing. | 1396 escape key. If FRAME has no menu bar this function does nothing. |
1397 | 1397 |
3814 #endif | 3814 #endif |
3815 | 3815 |
3816 defsubr (&Sx_popup_menu); | 3816 defsubr (&Sx_popup_menu); |
3817 | 3817 |
3818 #if defined (USE_GTK) || defined (USE_X_TOOLKIT) | 3818 #if defined (USE_GTK) || defined (USE_X_TOOLKIT) |
3819 defsubr (&Smenu_bar_open); | 3819 defsubr (&Sx_menu_bar_open); |
3820 Fdefalias (intern ("accelerate-menu"), intern (Smenu_bar_open.symbol_name), | 3820 Fdefalias (intern ("accelerate-menu"), |
3821 Qnil); | 3821 intern (Sx_menu_bar_open.symbol_name), |
3822 Qnil); | |
3822 #endif | 3823 #endif |
3823 | 3824 |
3824 #ifdef HAVE_MENUS | 3825 #ifdef HAVE_MENUS |
3825 defsubr (&Sx_popup_dialog); | 3826 defsubr (&Sx_popup_dialog); |
3826 #endif | 3827 #endif |