mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-13 15:00:42 -08:00
(menu_item_equiv_key): If command is an alias,
check only the underlying command for a keyboard equivalent.
This commit is contained in:
parent
a5425c8d9a
commit
86e00a8a09
1 changed files with 5 additions and 1 deletions
|
|
@ -344,13 +344,17 @@ menu_item_equiv_key (item_string, item1, descrip_ptr)
|
|||
{
|
||||
changed = 1;
|
||||
descrip = Qnil;
|
||||
savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
|
||||
/* 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))
|
||||
savedkey = Fwhere_is_internal (XSYMBOL (def)->function,
|
||||
Qnil, Qt, Qnil);
|
||||
else
|
||||
/* Otherwise look up the specified command itself.
|
||||
We don't try both, because that makes easymenu menus slow. */
|
||||
savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
|
||||
|
||||
|
||||
if (VECTORP (savedkey)
|
||||
&& EQ (XVECTOR (savedkey)->contents[0], Qmenu_bar))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue