Mercurial > emacs
changeset 32844:5aa0846c2995
(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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 25 Oct 2000 03:02:17 +0000 |
| parents | b1bb2dfda79c |
| children | e92097fd9144 |
| files | src/keymap.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keymap.c Wed Oct 25 02:55:21 2000 +0000 +++ b/src/keymap.c Wed Oct 25 03:02:17 2000 +0000 @@ -415,13 +415,14 @@ 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))