mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

(read_char): If end_time specified, don't put the

Browse Source 
event into this_command_keys.
(read_key_sequence): If Voverriding_terminal_local_map is specified,
don't check Voverriding_local_map at all.
This commit is contained in:
Richard M. Stallman 2006-09-13 15:12:59 +00:00
parent b96572ff12
commit 4c0240d20a
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/keyboard.c
View File

@ -3257,8 +3257,9 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
goto retry; goto retry;
} }
if (! reread || this_command_key_count == 0 if ((! reread || this_command_key_count == 0
|| this_command_key_count_reset) || this_command_key_count_reset)
&& !end_time)
{ {
/* Don't echo mouse motion events. */ /* Don't echo mouse motion events. */
@ -8765,17 +8766,25 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
the initial keymaps from the current buffer. */ the initial keymaps from the current buffer. */
nmaps = 0; nmaps = 0;
if (!NILP (current_kboard->Voverriding_terminal_local_map) if (!NILP (current_kboard->Voverriding_terminal_local_map))
|| !NILP (Voverriding_local_map))
{ {
if (3 > nmaps_allocated) if (2 > nmaps_allocated)
{ {
submaps = (Lisp_Object *) alloca (3 * sizeof (submaps[0])); submaps = (Lisp_Object *) alloca (2 * sizeof (submaps[0]));
defs = (Lisp_Object *) alloca (3 * sizeof (defs[0])); defs = (Lisp_Object *) alloca (2 * sizeof (defs[0]));
nmaps_allocated = 3; nmaps_allocated = 2;
} }
if (!NILP (current_kboard->Voverriding_terminal_local_map)) if (!NILP (current_kboard->Voverriding_terminal_local_map))
submaps[nmaps++] = current_kboard->Voverriding_terminal_local_map; submaps[nmaps++] = current_kboard->Voverriding_terminal_local_map;
}
else if (!NILP (Voverriding_local_map))
{
if (2 > nmaps_allocated)
{
submaps = (Lisp_Object *) alloca (2 * sizeof (submaps[0]));
defs = (Lisp_Object *) alloca (2 * sizeof (defs[0]));
nmaps_allocated = 2;
}
if (!NILP (Voverriding_local_map)) if (!NILP (Voverriding_local_map))
submaps[nmaps++] = Voverriding_local_map; submaps[nmaps++] = Voverriding_local_map;
} }