diff options
| author | Kim F. Storm | 2007-01-24 00:26:30 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2007-01-24 00:26:30 +0000 |
| commit | 0af1451662ff7dbb89720e1905730edb38af9b05 (patch) | |
| tree | a8ed95ccc10da005f3ad7ae1cbef66a689af2493 /src | |
| parent | ff40b263cb19cd6ffcc0e53e7204c99f20992961 (diff) | |
| download | emacs-0af1451662ff7dbb89720e1905730edb38af9b05.tar.gz emacs-0af1451662ff7dbb89720e1905730edb38af9b05.zip | |
(describe_map): Don't consider prefix keys to be shadowed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keymap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c index 20e01759f8d..6b4b8536fe1 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -3455,9 +3455,13 @@ describe_map (map, prefix, elt_describer, partial, shadow, | |||
| 3455 | tem = shadow_lookup (shadow, kludge, Qt); | 3455 | tem = shadow_lookup (shadow, kludge, Qt); |
| 3456 | if (!NILP (tem)) | 3456 | if (!NILP (tem)) |
| 3457 | { | 3457 | { |
| 3458 | /* If both bindings are keymaps, this key is a prefix key, | ||
| 3459 | so don't say it is shadowed. */ | ||
| 3460 | if (KEYMAPP (definition) && KEYMAPP (tem)) | ||
| 3461 | ; | ||
| 3458 | /* Avoid generating duplicate entries if the | 3462 | /* Avoid generating duplicate entries if the |
| 3459 | shadowed binding has the same definition. */ | 3463 | shadowed binding has the same definition. */ |
| 3460 | if (mention_shadow && !EQ (tem, definition)) | 3464 | else if (mention_shadow && !EQ (tem, definition)) |
| 3461 | this_shadowed = 1; | 3465 | this_shadowed = 1; |
| 3462 | else | 3466 | else |
| 3463 | continue; | 3467 | continue; |