comparison src/keymap.c @ 15378:ecfc288350ab

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

15377:65d9ff2c8602

  map_parent = Fkeymap_parent (map);
  if (! NILP (map_parent))
    parent_entry = access_keymap (map_parent, event, 0, 0);
  else
    parent_entry = Qnil;

  if (! EQ (parent_entry, submap))
    Fset_keymap_parent (submap, parent_entry);
}

15378:ecfc288350ab

  map_parent = Fkeymap_parent (map);
  if (! NILP (map_parent))
    parent_entry = access_keymap (map_parent, event, 0, 0);
  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);
}