From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 25 Apr 2001 14:36:32 +0000 (+0000)
Subject: (command_loop_1): Redo change of 2001-03-12.
X-Git-Tag: emacs-pretest-21.0.103~120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be2488ca370447b610e66a3ea98c43bd821cfb15;p=emacs.git

(command_loop_1): Redo change of 2001-03-12.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e1820b93b22..eb2f0d07c07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2001-04-25  Gerd Moellmann  <gerd@gnu.org>
 
+	* keyboard.c (command_loop_1): Redo change of 2001-03-12.
+
 	* xdisp.c (try_window_id): Fix a case where window_end_pos
 	and window_end_bytepos were not adjusted.
 
diff --git a/src/keyboard.c b/src/keyboard.c
index a9dd324a381..da1ce089b9d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1479,6 +1479,10 @@ command_loop_1 ()
          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;