Commit 4315204e authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(Fcall_last_kbd_macro): Set this_command from last_command

on entry and again on exit.
parent 2d8e7e1f
...@@ -204,12 +204,22 @@ defining others, use \\[name-last-kbd-macro].") ...@@ -204,12 +204,22 @@ defining others, use \\[name-last-kbd-macro].")
(prefix) (prefix)
Lisp_Object prefix; Lisp_Object prefix;
{ {
/* Don't interfere with recognition of the previous command
from before this macro started. */
this_command = current_kboard->Vlast_command;
if (! NILP (current_kboard->defining_kbd_macro)) if (! NILP (current_kboard->defining_kbd_macro))
error ("Can't execute anonymous macro while defining one"); error ("Can't execute anonymous macro while defining one");
else if (NILP (current_kboard->Vlast_kbd_macro)) else if (NILP (current_kboard->Vlast_kbd_macro))
error ("No kbd macro has been defined"); error ("No kbd macro has been defined");
else else
Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, prefix); Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, prefix);
/* command_loop_1 sets this to nil before it returns;
get back the last command within the macro
so that it can be last, again, after we return. */
this_command = current_kboard->Vlast_command;
return Qnil; return Qnil;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment