# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1201301861 0
# Node ID 6116c13fed46a37d55552f466a1dd1d6d78725e6
# Parent  0f04103be3bf1e36577f486ee0b5a5dd0e65be9d
(read_char): Restore echo_message_buffer after redisplay.

diff -r 0f04103be3bf -r 6116c13fed46 src/keyboard.c
--- a/src/keyboard.c	Fri Jan 25 22:56:30 2008 +0000
+++ b/src/keyboard.c	Fri Jan 25 22:57:41 2008 +0000
@@ -2704,6 +2704,8 @@
   /* if redisplay was requested */
   if (commandflag >= 0)
     {
+      int echo_current = echo_message_buffer == echo_area_buffer[0];
+
 	/* If there is pending input, process any events which are not
 	   user-visible, such as X selection_request events.  */
       if (input_pending
@@ -2727,6 +2729,12 @@
 	  swallow_events (0);
 	  /* If that cleared input_pending, try again to redisplay.  */
 	}
+
+      /* Prevent the redisplay we just did
+	 from messing up echoing of the input after the prompt.  */
+      if (commandflag == 0 && echo_current)
+	echo_message_buffer = echo_area_buffer[0];
+
     }
 
   /* Message turns off echoing unless more keystrokes turn it on again.