summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-06-13 21:04:29 +0000
committerRichard M. Stallman <rms@gnu.org>1996-06-13 21:04:29 +0000
commit46049510ed6bc3c3f8fee6f928ac159e1fd88ab3 (patch)
treedb77a36290cc55b9a8309b16a22be0c47165f977
parent8782df6db877d6d3a4105f84f88d96bcb785b693 (diff)
downloademacs-46049510ed6bc3c3f8fee6f928ac159e1fd88ab3.tar.gz
(Qmenu_alias): New variable.
(syms_of_xmenu): Initialize it. (menu_item_equiv_key): Check this property on the definition.
-rw-r--r--src/xmenu.c8
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. */
Lisp_Object Qdebug_on_next_call;
+Lisp_Object Qmenu_alias;
+
extern Lisp_Object Qmenu_enable;
extern Lisp_Object Qmenu_bar;
extern Lisp_Object Qmouse_click, Qevent_kind;
@@ -396,7 +398,8 @@ menu_item_equiv_key (item_string, item1, descrip_ptr)
/* If the command is an alias for another
(such as easymenu.el and lmenu.el set it up),
see if the original command name has equivalent keys. */
- if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function))
+ if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)
+ && ! NILP (Fget (def, Qmenu_alias)))
savedkey = Fwhere_is_internal (XSYMBOL (def)->function,
Qnil, Qt, Qnil);
else
@@ -2649,6 +2652,9 @@ syms_of_xmenu ()
staticpro (&menu_items);
menu_items = Qnil;
+ Qmenu_alias = intern ("menu-alias");
+ staticpro (&Qmenu_alias);
+
Qdebug_on_next_call = intern ("debug-on-next-call");
staticpro (&Qdebug_on_next_call);