mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 07:11:34 -08:00
Code Issues Projects Releases Wiki Activity

(Fkey_binding, describe_buffer_bindings):

Browse source 
Check Voverriding_terminal_local_map before Voverriding_local_map.
This commit is contained in:
Karl Heuer 1995-06-16 05:24:27 +00:00
parent f73d11631e
commit e784236dea
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/keymap.c
View file

@ -887,7 +887,14 @@ recognize the default bindings, just as `read-key-sequence' does.")
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 @@ nominal alternate\n\
/* 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 @@ nominal alternate\n\
}
/* 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;