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

7e05cdaf · Stefan Monnier · 45e680a8 · 7e05cdaf · 7e05cdaf
Commit 7e05cdaf authored Oct 16, 2000 by Stefan Monnier
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

src/ChangeLog src/ChangeLog +4 -0

src/keymap.c src/keymap.c +1 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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

--- 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));