1 files changed, 6 insertions, 5 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 29d6d6778f4..53030e22c75 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -430,10 +430,9 @@ kset_system_key_syms (struct kboard *kb, Lisp_Object val)
 static bool
 echo_keystrokes_p (void)
 {
-  return (!cursor_in_echo_area)
-         && (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
-             : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0
-             : false);
+  return (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
+          : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0
+          : false);
 }
 
 /* Add C to the echo string, without echoing it immediately.  C can be
@@ -8902,7 +8901,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
           if (!echo_keystrokes_p ())
             current_kboard->immediate_echo = false;
         }
-      else if (echo_keystrokes_p ())
+      else if (cursor_in_echo_area /* FIXME: Not sure why we test this here,
+                                      maybe we should just drop this test.  */
+               && echo_keystrokes_p ())
         /* This doesn't put in a dash if the echo buffer is empty, so
            you don't always see a dash hanging out in the minibuffer.  */
         echo_dash ();