aboutsummaryrefslogtreecommitdiffstats
path: root/src/callint.c
diff options
context:
space:
mode:
authorStefan Monnier2012-06-02 15:21:34 -0400
committerStefan Monnier2012-06-02 15:21:34 -0400
commitf2d6a3df6ab288a909ad3dc9fcadfdb28e46f2ee (patch)
tree496b84ebd6cbe2bd04405dac1a3a951d82f6cb3d /src/callint.c
parent7bd5c1f4a4abb97576a26d6b0a9691c5f530d99f (diff)
downloademacs-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/callint.c')
-rw-r--r--src/callint.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/callint.c b/src/callint.c
index 506698a4e4e..bfa981ec65a 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -284,7 +284,7 @@ invoke it. If KEYS is omitted or nil, the return value of
284 284
285 save_this_command = Vthis_command; 285 save_this_command = Vthis_command;
286 save_this_original_command = Vthis_original_command; 286 save_this_original_command = Vthis_original_command;
287 save_real_this_command = real_this_command; 287 save_real_this_command = Vreal_this_command;
288 save_last_command = KVAR (current_kboard, Vlast_command); 288 save_last_command = KVAR (current_kboard, Vlast_command);
289 289
290 if (NILP (keys)) 290 if (NILP (keys))
@@ -295,7 +295,7 @@ invoke it. If KEYS is omitted or nil, the return value of
295 key_count = ASIZE (keys); 295 key_count = ASIZE (keys);
296 } 296 }
297 297
298 /* Save this now, since use of minibuffer will clobber it. */ 298 /* Save this now, since use of minibuffer will clobber it. */
299 prefix_arg = Vcurrent_prefix_arg; 299 prefix_arg = Vcurrent_prefix_arg;
300 300
301 if (SYMBOLP (function)) 301 if (SYMBOLP (function))
@@ -310,7 +310,8 @@ invoke it. If KEYS is omitted or nil, the return value of
310 The feature is not fully implemented. */ 310 The feature is not fully implemented. */
311 filter_specs = Qnil; 311 filter_specs = Qnil;
312 312
313 /* If k or K discard an up-event, save it here so it can be retrieved with U */ 313 /* If k or K discard an up-event, save it here so it can be retrieved with
314 U. */
314 up_event = Qnil; 315 up_event = Qnil;
315 316
316 /* Set SPECS to the interactive form, or barf if not interactive. */ 317 /* Set SPECS to the interactive form, or barf if not interactive. */
@@ -370,14 +371,14 @@ invoke it. If KEYS is omitted or nil, the return value of
370 371
371 Vthis_command = save_this_command; 372 Vthis_command = save_this_command;
372 Vthis_original_command = save_this_original_command; 373 Vthis_original_command = save_this_original_command;
373 real_this_command= save_real_this_command; 374 Vreal_this_command = save_real_this_command;
374 KVAR (current_kboard, Vlast_command) = save_last_command; 375 KVAR (current_kboard, Vlast_command) = save_last_command;
375 376
376 temporarily_switch_to_single_kboard (NULL); 377 temporarily_switch_to_single_kboard (NULL);
377 return unbind_to (speccount, apply1 (function, specs)); 378 return unbind_to (speccount, apply1 (function, specs));
378 } 379 }
379 380
380 /* Here if function specifies a string to control parsing the defaults */ 381 /* Here if function specifies a string to control parsing the defaults. */
381 382
382 /* Set next_event to point to the first event with parameters. */ 383 /* Set next_event to point to the first event with parameters. */
383 for (next_event = 0; next_event < key_count; next_event++) 384 for (next_event = 0; next_event < key_count; next_event++)
@@ -841,7 +842,7 @@ invoke it. If KEYS is omitted or nil, the return value of
841 842
842 Vthis_command = save_this_command; 843 Vthis_command = save_this_command;
843 Vthis_original_command = save_this_original_command; 844 Vthis_original_command = save_this_original_command;
844 real_this_command= save_real_this_command; 845 Vreal_this_command = save_real_this_command;
845 KVAR (current_kboard, Vlast_command) = save_last_command; 846 KVAR (current_kboard, Vlast_command) = save_last_command;
846 847
847 { 848 {