Commit 320c9428 authored by Stefan Monnier's avatar Stefan Monnier

(fix_submap_inheritance): Use get_keymap_1 on parent_entry

rather than KEYMAPP, to allow EQ to work correctly if parent_entry is
a symbol.
parent 04145a65
......@@ -415,13 +415,14 @@ fix_submap_inheritance (map, event, submap)
map_parent = Fkeymap_parent (map);
if (! NILP (map_parent))
parent_entry = access_keymap (map_parent, event, 0, 0, 0);
parent_entry =
get_keymap_1 (access_keymap (map_parent, event, 0, 0, 0), 0, 0);
else
parent_entry = Qnil;
/* If MAP's parent has something other than a keymap,
our own submap shadows it completely. */
if (! KEYMAPP (parent_entry))
if (NILP (parent_entry))
return;
if (! EQ (parent_entry, submap))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment