Mercurial > emacs
changeset 12262:a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Check Voverriding_terminal_local_map before Voverriding_local_map.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Fri, 16 Jun 1995 05:24:27 +0000 |
| parents | cd2e7821bbf5 |
| children | 6ceecf7d1ec3 |
| files | src/keymap.c |
| diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keymap.c Fri Jun 16 05:19:43 1995 +0000 +++ b/src/keymap.c Fri Jun 16 05:24:27 1995 +0000 @@ -887,7 +887,14 @@ GCPRO1 (key); - if (!NILP (Voverriding_local_map)) + if (!NILP (current_kboard->Voverriding_terminal_local_map)) + { + value = Flookup_key (current_kboard->Voverriding_terminal_local_map, + key, accept_default); + if (! NILP (value) && !INTEGERP (value)) + RETURN_UNGCPRO (value); + } + else if (!NILP (Voverriding_local_map)) { value = Flookup_key (Voverriding_local_map, key, accept_default); if (! NILP (value) && !INTEGERP (value)) @@ -1843,7 +1850,8 @@ /* Temporarily switch to descbuf, so that we can get that buffer's minor modes correctly. */ Fset_buffer (descbuf); - if (!NILP (Voverriding_local_map)) + if (!NILP (current_kboard->Voverriding_terminal_local_map) + || !NILP (Voverriding_local_map)) nmaps = 0; else nmaps = current_minor_maps (&modes, &maps); @@ -1877,7 +1885,9 @@ } /* Print the (major mode) local map. */ - if (!NILP (Voverriding_local_map)) + if (!NILP (current_kboard->Voverriding_terminal_local_map)) + start1 = current_kboard->Voverriding_terminal_local_map; + else if (!NILP (Voverriding_local_map)) start1 = Voverriding_local_map; else start1 = XBUFFER (descbuf)->keymap;