From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 14 May 2005 14:09:36 +0000 (+0000)
Subject: (message3): Call cancel_echoing.
X-Git-Tag: ttn-vms-21-2-B4~304
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0644322d90f961b2c9c6fb329b939c386dfb22c8;p=emacs.git

(message3): Call cancel_echoing.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 56c686aed47..8bbe2811869 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6922,7 +6922,9 @@ message2_nolog (m, nbytes, multibyte)
 /* Display an echo area message M with a specified length of NBYTES
    bytes.  The string may include null characters.  If M is not a
    string, clear out any existing message, and let the mini-buffer
-   text show through.  */
+   text show through.
+
+   This function cancels echoing.  */
 
 void
 message3 (m, nbytes, multibyte)
@@ -6934,6 +6936,7 @@ message3 (m, nbytes, multibyte)
 
   GCPRO1 (m);
   clear_message (1,1);
+  cancel_echoing ();
 
   /* First flush out any partial line written with print.  */
   message_log_maybe_newline ();
@@ -6945,7 +6948,10 @@ message3 (m, nbytes, multibyte)
 }
 
 
-/* The non-logging version of message3.  */
+/* The non-logging version of message3.
+   This does not cancel echoing, because it is used for echoing.
+   Perhaps we need to make a separate function for echoing
+   and make this cancel echoing.  */
 
 void
 message3_nolog (m, nbytes, multibyte)