Changeset 3398

Timestamp:

08/13/04 20:26:24 (4 years ago)

Author:

fujii

Message:

* callint.c (Fcall_interactively): Save and restore Vthis_command,
real_this_command, and current_kbd->Vlast_command. These codes are
imported from Emacs CVS HEAD.

Files:

• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/callint.c (modified) (4 diffs)

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2004-08-13  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
+
+        * callint.c (Fcall_interactively): Save and restore Vthis_command,
+        real_this_command, and current_kbd->Vlast_command. These codes are
+        imported from Emacs CVS HEAD.
+
-2004-08-12  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/callint.c

@@ -40 +40 @@
-
-extern Lisp_Object Vhistory_length;
+extern Lisp_Object real_this_command;
-
-Lisp_Object Vcommand_debug_status, Qcommand_debug_status;
@@ -223 +224 @@
-  int key_count;
-
+  Lisp_Object save_this_command, save_last_command;
+  Lisp_Object save_real_this_command;
+
+  save_this_command = Vthis_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;
@@ -364 +372 @@
-            }
-        }
+
+      Vthis_command = save_this_command;
+      real_this_command= save_real_this_command;
+      current_kboard->Vlast_command = save_last_command;
+
-      single_kboard_state ();
-      return apply1 (function, specs);
@@ -788 +801 @@
-    if (varies[i] >= 1 && varies[i] <= 4)
-      XSETINT (args[i], marker_position (args[i]));
+
+  Vthis_command = save_this_command;
+  real_this_command= save_real_this_command;
+  current_kboard->Vlast_command = save_last_command;
-
-  single_kboard_state ();