(command_loop_1): Change Vtransient_mark_mode

before deciding whether to inctivate mark.

diff --git a/src/ChangeLog b/src/ChangeLog
index b65bb2d5714292effb88ca1ecbfa52a3447bb763..ea570820e1af78dccfa38f9f9e8a7e5c5d1aa6d3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-06  Richard M. Stallman  <rms@gnu.org>
+
+       * callint.c (Fcall_interactively): Avoid reusing EVENT for other data.
+
+       * xfaces.c (merge_named_face): GCPRO the face_name in the
+       named_merge_point struct that we make.
+       (merge_face_heights): Eliminate GCPRO arg.  All callers changed.
+
+       * keyboard.c (command_loop_1): Change Vtransient_mark_mode
+       before deciding whether to inactivate mark.
+
 2004-11-06  Lars Brinkhoff  <lars@nocrew.org>
 
        * config.in: Regenerate (add HAVE_GETRUSAGE).
@@ -17,7 +28,6 @@
        * xmenu.c (popup_get_selection, create_and_show_popup_menu)
        (create_and_show_dialog): Revert change from 2004-10-31.
        
-
 2004-11-05  Luc Teirlinck  <teirllm@auburn.edu>
 
        * macros.c (syms_of_macros) <defining-kbd-macro>: Doc fix.

diff --git a/src/keyboard.c b/src/keyboard.c
index d145ec50d2cec7e9f70bbd2eb20c5e6375b6c8fc..e2c21793c6c2529f2f9309437c236898e3a24e14 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1840,6 +1840,14 @@ command_loop_1 ()
 
       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 @@ command_loop_1 ()
            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