From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 4 Feb 2021 17:35:07 +0000 (+0200)
Subject: Avoid overwriting minibuffer prompt by keystrokes echo
X-Git-Tag: emacs-28.0.90~3934
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2d7f3f171386f39a55f73988f94b1f4c94d8a6b;p=emacs.git

Avoid overwriting minibuffer prompt by keystrokes echo

* src/lread.c (Fread_char, Fread_event, Fread_char_exclusive):
Call cancel_echoing to make sure the prompt is not obscured by
keystrokes echo.  (Bug#46243)
---

diff --git a/src/lread.c b/src/lread.c
index b33a312299f..010194c34ea 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -804,7 +804,10 @@ If `inhibit-interaction' is non-nil, this function will signal an
   barf_if_interaction_inhibited ();
 
   if (! NILP (prompt))
-    message_with_string ("%s", prompt, 0);
+    {
+      cancel_echoing ();
+      message_with_string ("%s", prompt, 0);
+    }
   val = read_filtered_event (1, 1, 1, ! NILP (inherit_input_method), seconds);
 
   return (NILP (val) ? Qnil
@@ -839,7 +842,10 @@ If `inhibit-interaction' is non-nil, this function will signal an
   barf_if_interaction_inhibited ();
 
   if (! NILP (prompt))
-    message_with_string ("%s", prompt, 0);
+    {
+      cancel_echoing ();
+      message_with_string ("%s", prompt, 0);
+    }
   return read_filtered_event (0, 0, 0, ! NILP (inherit_input_method), seconds);
 }
 
@@ -875,7 +881,10 @@ If `inhibit-interaction' is non-nil, this function will signal an
   barf_if_interaction_inhibited ();
 
   if (! NILP (prompt))
-    message_with_string ("%s", prompt, 0);
+    {
+      cancel_echoing ();
+      message_with_string ("%s", prompt, 0);
+    }
 
   val = read_filtered_event (1, 1, 0, ! NILP (inherit_input_method), seconds);