# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1099799378 0
# Node ID 3166194a373f7a9be4cc08a4253a7f9ca91dae31
# Parent  a017cc23b31dc26da037ca968a1e0527638ace5e
(command_loop_1): Change Vtransient_mark_mode
before deciding whether to inctivate mark.

diff -r a017cc23b31d -r 3166194a373f src/keyboard.c
--- a/src/keyboard.c	Sun Nov 07 03:48:56 2004 +0000
+++ b/src/keyboard.c	Sun Nov 07 03:49:38 2004 +0000
@@ -1840,6 +1840,14 @@
 
       if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
 	{
+	  /* Setting transient-mark-mode to `only' is a way of
+	     turning it on for just one command.  */
+
+	  if (EQ (Vtransient_mark_mode, Qidentity))
+	    Vtransient_mark_mode = Qnil;
+	  if (EQ (Vtransient_mark_mode, Qonly))
+	    Vtransient_mark_mode = Qidentity;
+
 	  if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
 	    {
 	      /* We could also call `deactivate'mark'.  */
@@ -1855,16 +1863,6 @@
 	    call1 (Vrun_hooks, intern ("activate-mark-hook"));
 	}
 
-      /* Setting transient-mark-mode to `only' is a way of
-	 turning it on for just one command.  */
-      if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
-	{
-	  if (EQ (Vtransient_mark_mode, Qidentity))
-	    Vtransient_mark_mode = Qnil;
-	  if (EQ (Vtransient_mark_mode, Qonly))
-	    Vtransient_mark_mode = Qidentity;
-	}
-
     finalize:
 
       if (current_buffer == prev_buffer