diff options
| author | Richard M. Stallman | 1996-06-13 21:04:29 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-06-13 21:04:29 +0000 |
| commit | 67385caa0ef5771b59bce4aaeff8036346c5f89b (patch) | |
| tree | 01317ec2c643c23d057d419c724f0cb01d3964b2 /src/xmenu.c | |
| parent | 51b1d12e571d958cd4e9b59713f7ec72c1d2b105 (diff) | |
| download | emacs-67385caa0ef5771b59bce4aaeff8036346c5f89b.tar.gz emacs-67385caa0ef5771b59bce4aaeff8036346c5f89b.zip | |
(Qmenu_alias): New variable.
(syms_of_xmenu): Initialize it.
(menu_item_equiv_key): Check this property on the definition.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 1ea7140d50f..e801cc31351 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -88,6 +88,8 @@ Boston, MA 02111-1307, USA. */ | |||
| 88 | 88 | ||
| 89 | Lisp_Object Qdebug_on_next_call; | 89 | Lisp_Object Qdebug_on_next_call; |
| 90 | 90 | ||
| 91 | Lisp_Object Qmenu_alias; | ||
| 92 | |||
| 91 | extern Lisp_Object Qmenu_enable; | 93 | extern Lisp_Object Qmenu_enable; |
| 92 | extern Lisp_Object Qmenu_bar; | 94 | extern Lisp_Object Qmenu_bar; |
| 93 | extern Lisp_Object Qmouse_click, Qevent_kind; | 95 | extern Lisp_Object Qmouse_click, Qevent_kind; |
| @@ -396,7 +398,8 @@ menu_item_equiv_key (item_string, item1, descrip_ptr) | |||
| 396 | /* If the command is an alias for another | 398 | /* If the command is an alias for another |
| 397 | (such as easymenu.el and lmenu.el set it up), | 399 | (such as easymenu.el and lmenu.el set it up), |
| 398 | see if the original command name has equivalent keys. */ | 400 | see if the original command name has equivalent keys. */ |
| 399 | if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)) | 401 | if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function) |
| 402 | && ! NILP (Fget (def, Qmenu_alias))) | ||
| 400 | savedkey = Fwhere_is_internal (XSYMBOL (def)->function, | 403 | savedkey = Fwhere_is_internal (XSYMBOL (def)->function, |
| 401 | Qnil, Qt, Qnil); | 404 | Qnil, Qt, Qnil); |
| 402 | else | 405 | else |
| @@ -2649,6 +2652,9 @@ syms_of_xmenu () | |||
| 2649 | staticpro (&menu_items); | 2652 | staticpro (&menu_items); |
| 2650 | menu_items = Qnil; | 2653 | menu_items = Qnil; |
| 2651 | 2654 | ||
| 2655 | Qmenu_alias = intern ("menu-alias"); | ||
| 2656 | staticpro (&Qmenu_alias); | ||
| 2657 | |||
| 2652 | Qdebug_on_next_call = intern ("debug-on-next-call"); | 2658 | Qdebug_on_next_call = intern ("debug-on-next-call"); |
| 2653 | staticpro (&Qdebug_on_next_call); | 2659 | staticpro (&Qdebug_on_next_call); |
| 2654 | 2660 | ||