From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 28 Aug 1996 14:24:49 +0000 (+0000)
Subject: (command_loop_1): Cancel echoing etc.
X-Git-Tag: emacs-20.1~3998
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51603bd058a74e904e9648027e287790c6993fa9;p=emacs.git

(command_loop_1): Cancel echoing etc.
before running post-command-hook and such.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index d394cc4f701..a343e1b59b5 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1370,22 +1370,6 @@ command_loop_1 ()
 	}
     directly_done: ;
 
-      /* Note that the value cell will never directly contain nil
-	 if the symbol is a local variable.  */
-      if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
-	safe_run_hooks (Qpost_command_hook);
-
-      if (!NILP (Vdeferred_action_list))
-	safe_run_hooks (Qdeferred_action_function);
-
-      if (!NILP (Vpost_command_idle_hook) && !NILP (Vrun_hooks))
-	{
-	  if (NILP (Vunread_command_events)
-	      && NILP (Vexecuting_macro)
-	      && !NILP (sit_for (0, post_command_idle_delay, 0, 1)))
-	    safe_run_hooks (Qpost_command_idle_hook);
-	}
-
       /* If there is a prefix argument,
 	 1) We don't want Vlast_command to be ``universal-argument''
 	 (that would be dumb), so don't set Vlast_command,
@@ -1407,6 +1391,22 @@ command_loop_1 ()
 	  this_single_command_key_start = 0;
 	}
 
+      /* Note that the value cell will never directly contain nil
+	 if the symbol is a local variable.  */
+      if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
+	safe_run_hooks (Qpost_command_hook);
+
+      if (!NILP (Vdeferred_action_list))
+	safe_run_hooks (Qdeferred_action_function);
+
+      if (!NILP (Vpost_command_idle_hook) && !NILP (Vrun_hooks))
+	{
+	  if (NILP (Vunread_command_events)
+	      && NILP (Vexecuting_macro)
+	      && !NILP (sit_for (0, post_command_idle_delay, 0, 1)))
+	    safe_run_hooks (Qpost_command_idle_hook);
+	}
+
       if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
 	{
 	  if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))