# HG changeset patch # User Richard M. Stallman # Date 834430765 0 # Node ID ecfc288350ab6aab52e433beccdb991d14c3db15 # Parent 65d9ff2c86025d0b3d295b1c1049b17a345910b2 (fix_submap_inheritance): If parent_entry is not a keymap, use nil instead. diff -r 65d9ff2c8602 -r ecfc288350ab src/keymap.c --- a/src/keymap.c Mon Jun 10 17:35:37 1996 +0000 +++ b/src/keymap.c Mon Jun 10 18:19:25 1996 +0000 @@ -379,6 +379,11 @@ 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); }