Mercurial > emacs
changeset 60065:42e18861b7b8
(Fsubstitute_command_keys): Compute list of shadowing maps
for describe_map_tree. Pass 1 for MENTION_SHADOWS.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 15 Feb 2005 06:36:17 +0000 |
| parents | 896e880eab56 |
| children | eca75f16d020 |
| files | src/doc.c |
| diffstat | 1 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doc.c Tue Feb 15 06:33:15 2005 +0000 +++ b/src/doc.c Tue Feb 15 06:36:17 2005 +0000 @@ -882,6 +882,9 @@ { struct buffer *oldbuf; int start_idx; + /* This is for computing the SHADOWS arg for describe_map_tree. */ + Lisp_Object active_maps = Fcurrent_active_maps (Qnil); + Lisp_Object earlier_maps; changed = 1; strp += 2; /* skip \{ or \< */ @@ -932,7 +935,13 @@ else if (start[-1] == '<') keymap = tem; else - describe_map_tree (tem, 1, Qnil, Qnil, (char *)0, 1, 0, 0); + { + /* Get the list of active keymaps that precede this one. + If this one's not active, get nil. */ + earlier_maps = Fcdr (Fmemq (tem, Freverse (active_maps))); + describe_map_tree (tem, 1, Fnreverse (earlier_maps), + Qnil, (char *)0, 1, 0, 0, 1); + } tem = Fbuffer_string (); Ferase_buffer (); set_buffer_internal (oldbuf);