2 files changed, 6 insertions, 0 deletions

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;