aboutsummaryrefslogtreecommitdiffstats
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorKaroly Lorentey <[email protected]>2006-07-29 20:57:26 +0000
committerKaroly Lorentey <[email protected]>2006-07-29 20:57:26 +0000
commit14ab3a40ec0cfdfa7f351e1202e0f873af553391 (patch)
tree8e0369b9f5716ef4fac672fd816af559051396ff /src/xmenu.c
parente6aee454e682e137d5b04116716d308c1d5c3544 (diff)
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: [email protected]/emacs--multi-tty--0--patch-577
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 48320479ad..1650222ae8 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1310,7 +1310,7 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers)
}
}
-DEFUN ("menu-bar-open", Fmenu_bar_open, Smenu_bar_open, 0, 1, "i",
+DEFUN ("x-menu-bar-open", Fx_menu_bar_open, Sx_menu_bar_open, 0, 1, "i",
doc: /* Start key navigation of the menu bar in FRAME.
This initially opens the first menu bar item and you can then navigate with the
arrow keys, select a menu entry with the return key or cancel with the
@@ -1389,7 +1389,7 @@ If FRAME is nil or not given, use the selected frame. */)
#ifdef USE_GTK
-DEFUN ("menu-bar-open", Fmenu_bar_open, Smenu_bar_open, 0, 1, "i",
+DEFUN ("x-menu-bar-open", Fx_menu_bar_open, Sx_menu_bar_open, 0, 1, "i",
doc: /* Start key navigation of the menu bar in FRAME.
This initially opens the first menu bar item and you can then navigate with the
arrow keys, select a menu entry with the return key or cancel with the
@@ -3816,9 +3816,10 @@ The enable predicate for a menu command should check this variable. */);
defsubr (&Sx_popup_menu);
#if defined (USE_GTK) || defined (USE_X_TOOLKIT)
- defsubr (&Smenu_bar_open);
- Fdefalias (intern ("accelerate-menu"), intern (Smenu_bar_open.symbol_name),
- Qnil);
+ defsubr (&Sx_menu_bar_open);
+ Fdefalias (intern ("accelerate-menu"),
+ intern (Sx_menu_bar_open.symbol_name),
+ Qnil);
#endif
#ifdef HAVE_MENUS