Commit 3393c3f5 authored by Richard M. Stallman's avatar Richard M. Stallman

(fix_submap_inheritance): If parent_entry is not a keymap, use nil instead.

parent 7830e24b
......@@ -379,6 +379,11 @@ fix_submap_inheritance (map, event, submap)
else
parent_entry = Qnil;
/* If MAP's parent has something other than a keymap,
our own submap shadows it completely, so use nil as SUBMAP's parent. */
if (! (CONSP (parent_entry) && EQ (XCONS (parent_entry)->car, Qkeymap)))
parent_entry = Qnil;
if (! EQ (parent_entry, submap))
Fset_keymap_parent (submap, parent_entry);
}
......
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