[Emacs-diffs] Changes to emacs/src/callint.c

[Richard M. Stallman]

Index: emacs/src/callint.c
diff -c emacs/src/callint.c:1.126 emacs/src/callint.c:1.127
*** emacs/src/callint.c:1.126   Sat May 17 17:17:45 2003
--- emacs/src/callint.c Fri Aug 29 12:15:31 2003
***************
*** 41,46 ****
--- 41,47 ----
  Lisp_Object Vcommand_history;
  
  extern Lisp_Object Vhistory_length;
+ extern Lisp_Object Vthis_original_command, real_this_command;
  
  Lisp_Object Vcommand_debug_status, Qcommand_debug_status;
  Lisp_Object Qenable_recursive_minibuffers;
***************
*** 291,296 ****
--- 292,305 ----
    int key_count;
    int record_then_fail = 0;
  
+   Lisp_Object save_this_command, save_last_command;
+   Lisp_Object save_this_original_command, save_real_this_command;
+ 
+   save_this_command = Vthis_command;
+   save_this_original_command = Vthis_original_command;
+   save_real_this_command = real_this_command;
+   save_last_command = current_kboard->Vlast_command;
+ 
    if (NILP (keys))
      keys = this_command_keys, key_count = this_command_key_count;
    else
***************
*** 395,400 ****
--- 404,415 ----
                XSETCDR (teml, Qnil);
            }
        }
+ 
+       Vthis_command = save_this_command;
+       Vthis_original_command = save_this_original_command;
+       real_this_command= save_real_this_command;
+       current_kboard->Vlast_command = save_last_command;
+ 
        single_kboard_state ();
        return apply1 (function, specs);
      }
***************
*** 840,845 ****
--- 855,865 ----
  
    if (record_then_fail)
      Fbarf_if_buffer_read_only ();
+ 
+   Vthis_command = save_this_command;
+   Vthis_original_command = save_this_original_command;
+   real_this_command= save_real_this_command;
+   current_kboard->Vlast_command = save_last_command;
  
    single_kboard_state ();