(keymap_memberp): Ensure that nil is not a member.

diff --git a/src/ChangeLog b/src/ChangeLog
index a12519a96c0c1c50b402bd5c46cd60733bba10b2..09b6d5b10f888a8f8d668bceb280d6c28a4d916e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-16  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * keymap.c (keymap_memberp): Ensure that nil is not a member.
+
 2000-10-16  Gerd Moellmann  <gerd@gnu.org>
 
        * xdisp.c (set_iterator_to_next): Reset box start and end flags of

diff --git a/src/keymap.c b/src/keymap.c
index 7fe8718aa095e00004be1ddbe98b0118ab8f8f42..fbbbcae3998e34ab77c4424c70f50fcb2495c4c2 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -311,6 +311,7 @@ int
 keymap_memberp (map, maps)
      Lisp_Object map, maps;
 {
+  if (NILP (map)) return 0;
   while (KEYMAPP (maps) && !EQ (map, maps))
     maps = Fkeymap_parent (maps);
   return (EQ (map, maps));