[Emacs-diffs] Changes to emacs/src/keyboard.c,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       08/01/25 22:57:42

Index: keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.938
retrieving revision 1.939
diff -u -b -r1.938 -r1.939
--- keyboard.c  13 Jan 2008 00:43:54 -0000      1.938
+++ keyboard.c  25 Jan 2008 22:57:41 -0000      1.939
@@ -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.