procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression with 'recent-keys' and keyboard macros

Browse source 
* src/keyboard.c (record_char): Don't record in 'recent_keys'
events that come from executing keyboard macros.  (Bug#22674)
This commit is contained in:
Eli Zaretskii 2016-02-15 14:03:57 +02:00
parent 903603f8cd
commit d9ea795035
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/keyboard.c
View file

@ -3220,6 +3220,9 @@ record_char (Lisp_Object c)
else else
store_kbd_macro_char (c); store_kbd_macro_char (c);
/* recent_keys should not include events from keyboard macros. */
if (NILP (Vexecuting_kbd_macro))
{
if (!recorded) if (!recorded)
{ {
total_keys += total_keys < NUM_RECENT_KEYS; total_keys += total_keys < NUM_RECENT_KEYS;
@ -3247,6 +3250,7 @@ record_char (Lisp_Object c)
} }
num_nonmacro_input_events++; num_nonmacro_input_events++;
}
/* Write c to the dribble file. If c is a lispy event, write /* Write c to the dribble file. If c is a lispy event, write
the event's symbol to the dribble file, in <brackets>. Bleaugh. the event's symbol to the dribble file, in <brackets>. Bleaugh.