From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 12 Dec 2015 08:05:26 +0000 (+0200)
Subject: Fix echo for "C-u"
X-Git-Tag: emacs-25.0.90~494
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b7d6b026eb2cd69a90a9af41a4fca24389c5e47;p=emacs.git

Fix echo for "C-u"

* src/keyboard.c (command_loop_1): Undo last change.  It caused
duplicate echo of C-u.  (Bug#22107)
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 928d8496cdb..02bc7d2a0b7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1486,14 +1486,11 @@ command_loop_1 (void)
       if (!CONSP (last_command_event))
 	kset_last_repeatable_command (current_kboard, Vreal_this_command);
 
-      /* Don't reset this_command_key_count if we've processed
-	 prefix-arg.  */
-      if (NILP (call0 (Qinternal_echo_keystrokes_prefix)))
-	{
-	  this_command_key_count = 0;
-	  this_single_command_key_start = 0;
-	}
-      else if (current_kboard->immediate_echo)
+      this_command_key_count = 0;
+      this_single_command_key_start = 0;
+
+      if (current_kboard->immediate_echo
+	  && !NILP (call0 (Qinternal_echo_keystrokes_prefix)))
 	{
 	  current_kboard->immediate_echo = false;
 	  /* Refresh the echo message.  */