changeset 36745:a12182d34820

(command_loop_1): Set Vdeactivate_mark to nil before running the command; timer functions or process filters may have set it.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 12 Mar 2001 15:14:11 +0000
parents fa8bc7dd83aa
children 6e4beb27bc38
files src/keyboard.c
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Mon Mar 12 14:57:30 2001 +0000
+++ b/src/keyboard.c	Mon Mar 12 15:14:11 2001 +0000
@@ -1280,10 +1280,11 @@
 /* This is the actual command reading loop,
    sans error-handling encapsulation.  */
 
-Lisp_Object Fcommand_execute ();
-static int read_key_sequence ();
-void safe_run_hooks ();
-static void adjust_point_for_property ();
+EXFUN (Fcommand_execute, 4);
+static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object,
+				  int, int, int));
+void safe_run_hooks P_ ((Lisp_Object));
+static void adjust_point_for_property P_ ((int));
 
 Lisp_Object
 command_loop_1 ()
@@ -1478,6 +1479,10 @@
          this variable differently.  */
       Vdisable_point_adjustment = Qnil;
 
+      /* Process filters and timers may have messed with deactivate-mark.
+	 reset it before we execute the command. */
+      Vdeactivate_mark = Qnil;
+
       /* Execute the command.  */
 
       Vthis_command = cmd;