Mercurial > emacs
comparison src/keymap.c @ 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 | f915f46d067c |
| children | c1b3ab2a1ccc |
comparison
equal
deleted
inserted
replaced
| 32843:b1bb2dfda79c | 32844:5aa0846c2995 |
|---|---|
| 413 if (NILP (submap)) | 413 if (NILP (submap)) |
| 414 return; | 414 return; |
| 415 | 415 |
| 416 map_parent = Fkeymap_parent (map); | 416 map_parent = Fkeymap_parent (map); |
| 417 if (! NILP (map_parent)) | 417 if (! NILP (map_parent)) |
| 418 parent_entry = access_keymap (map_parent, event, 0, 0, 0); | 418 parent_entry = |
| 419 get_keymap_1 (access_keymap (map_parent, event, 0, 0, 0), 0, 0); | |
| 419 else | 420 else |
| 420 parent_entry = Qnil; | 421 parent_entry = Qnil; |
| 421 | 422 |
| 422 /* If MAP's parent has something other than a keymap, | 423 /* If MAP's parent has something other than a keymap, |
| 423 our own submap shadows it completely. */ | 424 our own submap shadows it completely. */ |
| 424 if (! KEYMAPP (parent_entry)) | 425 if (NILP (parent_entry)) |
| 425 return; | 426 return; |
| 426 | 427 |
| 427 if (! EQ (parent_entry, submap)) | 428 if (! EQ (parent_entry, submap)) |
| 428 { | 429 { |
| 429 Lisp_Object submap_parent; | 430 Lisp_Object submap_parent; |