diff options
| author | Stefan Monnier | 2012-06-02 15:21:34 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-06-02 15:21:34 -0400 |
| commit | f2d6a3df6ab288a909ad3dc9fcadfdb28e46f2ee (patch) | |
| tree | 496b84ebd6cbe2bd04405dac1a3a951d82f6cb3d /src/macros.c | |
| parent | 7bd5c1f4a4abb97576a26d6b0a9691c5f530d99f (diff) | |
| download | emacs-f2d6a3df6ab288a909ad3dc9fcadfdb28e46f2ee.tar.gz emacs-f2d6a3df6ab288a909ad3dc9fcadfdb28e46f2ee.zip | |
* lisp/simple.el (execute-extended-command): Set real-this-command.
* src/keyboard.c: Export real-this-command to Elisp.
(syms_of_keyboard): Rename real_this_command to Vreal_this_command
and DEFVAR it. Update all users.
Fixes: debbugs:11506
Diffstat (limited to 'src/macros.c')
| -rw-r--r-- | src/macros.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/macros.c b/src/macros.c index 3f4f8624479..0db7e63d622 100644 --- a/src/macros.c +++ b/src/macros.c | |||
| @@ -259,7 +259,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) | |||
| 259 | from before this macro started. */ | 259 | from before this macro started. */ |
| 260 | Vthis_command = KVAR (current_kboard, Vlast_command); | 260 | Vthis_command = KVAR (current_kboard, Vlast_command); |
| 261 | /* C-x z after the macro should repeat the macro. */ | 261 | /* C-x z after the macro should repeat the macro. */ |
| 262 | real_this_command = KVAR (current_kboard, Vlast_kbd_macro); | 262 | Vreal_this_command = KVAR (current_kboard, Vlast_kbd_macro); |
| 263 | 263 | ||
| 264 | if (! NILP (KVAR (current_kboard, defining_kbd_macro))) | 264 | if (! NILP (KVAR (current_kboard, defining_kbd_macro))) |
| 265 | error ("Can't execute anonymous macro while defining one"); | 265 | error ("Can't execute anonymous macro while defining one"); |
| @@ -286,7 +286,7 @@ pop_kbd_macro (Lisp_Object info) | |||
| 286 | Vexecuting_kbd_macro = XCAR (info); | 286 | Vexecuting_kbd_macro = XCAR (info); |
| 287 | tem = XCDR (info); | 287 | tem = XCDR (info); |
| 288 | executing_kbd_macro_index = XINT (XCAR (tem)); | 288 | executing_kbd_macro_index = XINT (XCAR (tem)); |
| 289 | real_this_command = XCDR (tem); | 289 | Vreal_this_command = XCDR (tem); |
| 290 | Frun_hooks (1, &Qkbd_macro_termination_hook); | 290 | Frun_hooks (1, &Qkbd_macro_termination_hook); |
| 291 | return Qnil; | 291 | return Qnil; |
| 292 | } | 292 | } |
| @@ -321,7 +321,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) | |||
| 321 | 321 | ||
| 322 | tem = Fcons (Vexecuting_kbd_macro, | 322 | tem = Fcons (Vexecuting_kbd_macro, |
| 323 | Fcons (make_number (executing_kbd_macro_index), | 323 | Fcons (make_number (executing_kbd_macro_index), |
| 324 | real_this_command)); | 324 | Vreal_this_command)); |
| 325 | record_unwind_protect (pop_kbd_macro, tem); | 325 | record_unwind_protect (pop_kbd_macro, tem); |
| 326 | 326 | ||
| 327 | GCPRO2 (final, loopfunc); | 327 | GCPRO2 (final, loopfunc); |
| @@ -352,7 +352,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) | |||
| 352 | 352 | ||
| 353 | executing_kbd_macro = Qnil; | 353 | executing_kbd_macro = Qnil; |
| 354 | 354 | ||
| 355 | real_this_command = Vexecuting_kbd_macro; | 355 | Vreal_this_command = Vexecuting_kbd_macro; |
| 356 | 356 | ||
| 357 | UNGCPRO; | 357 | UNGCPRO; |
| 358 | return unbind_to (pdlcount, Qnil); | 358 | return unbind_to (pdlcount, Qnil); |