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

diff --git a/src/ChangeLog b/src/ChangeLog
index e1820b93b22a539c37a5ecffbe90d96ee1145269..eb2f0d07c07f42537393612a9d802a598cfc56e1 100644 (file)
--- 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 a9dd324a381594c2b9265715cf138ff888851a05..da1ce089b9dd897d54b10827fcc536cbbe987907 100644 (file)
--- 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;