From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 25 Oct 2000 03:02:17 +0000 (+0000)
Subject: (fix_submap_inheritance): Use get_keymap_1 on parent_entry
X-Git-Tag: emacs-pretest-21.0.90~605
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=320c9428b462841969d8b51463f3f963e776d190;p=emacs.git

(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.
---

diff --git a/src/keymap.c b/src/keymap.c
index 869cc318252..e1fbb1b3ebc 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -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))