mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 04:10:27 -08:00
Code Issues Projects Releases Wiki Activity

(Fwhere_is_internal): Ignore menu-bar' and tool-bar'.

Browse source 
(where_is_internal_1): Don't bother ignoring menu-items any more.
This commit is contained in:
Stefan Monnier 2000-10-04 23:16:46 +00:00
parent 55d5d71752
commit 35810b6fff
2 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2000-10-04 Stefan Monnier <monnier@cs.yale.edu>
* keymap.c (Fwhere_is_internal): Ignore `menu-bar' and `tool-bar'.
(where_is_internal_1): Don't bother ignoring menu-items any more.
2000-10-04 Gerd Moellmann <gerd@gnu.org>
* keyboard.c (update_menu_bindings): New variable.

32
src/keymap.c
View file

@ -2170,6 +2170,14 @@ indirect definition itself.")
last_is_meta = (XINT (last) >= 0
&& EQ (Faref (this, last), meta_prefix_char));
if (nomenus && XINT (last) >= 0)
{ /* If no menu entries should be returned, skip over the
keymaps bound to `menu-bar' and `tool-bar'. */
Lisp_Object tem = Faref (this, 0);
if (EQ (tem, Qmenu_bar) || EQ (tem, Qtool_bar))
continue;
}
QUIT;
while (CONSP (map))
@ -2328,29 +2336,7 @@ where_is_internal_1 (binding, key, definition, noindirect, keymap, this, last,
/* Search through indirections unless that's not wanted. */
if (NILP (noindirect))
{
if (nomenus)
{
while (1)
{
Lisp_Object map, tem;
/* If the contents are (KEYMAP . ELEMENT), go indirect. */
map = get_keymap_1 (Fcar_safe (definition), 0, 0);
tem = Fkeymapp (map);
if (!NILP (tem))
definition = access_keymap (map, Fcdr (definition), 0, 0);
else
break;
}
/* If the contents are (menu-item ...) or (STRING ...), reject. */
if (CONSP (definition)
&& (EQ (XCAR (definition),Qmenu_item)
|| STRINGP (XCAR (definition))))
return Qnil;
}
else
binding = get_keyelt (binding, 0);
}
binding = get_keyelt (binding, 0);
/* End this iteration if this element does not match
the target. */