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 928d8496cdb11287636d8f88d7da0b5b0500f3f8..02bc7d2a0b710dc48e05d24b35e63300223fb660 100644 (file)
--- 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.  */