[Emacs-diffs] Changes to emacs/src/xdisp.c

[Richard M . Stallman]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1007 emacs/src/xdisp.c:1.1008
*** emacs/src/xdisp.c:1.1007    Mon May  2 17:08:44 2005
--- emacs/src/xdisp.c   Sat May 14 14:09:36 2005
***************
*** 6922,6928 ****
  /* 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.  */
  
  void
  message3 (m, nbytes, multibyte)
--- 6922,6930 ----
  /* 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.
! 
!    This function cancels echoing.  */
  
  void
  message3 (m, nbytes, multibyte)
***************
*** 6934,6939 ****
--- 6936,6942 ----
  
    GCPRO1 (m);
    clear_message (1,1);
+   cancel_echoing ();
  
    /* First flush out any partial line written with print.  */
    message_log_maybe_newline ();
***************
*** 6945,6951 ****
  }
  
  
! /* The non-logging version of message3.  */
  
  void
  message3_nolog (m, nbytes, multibyte)
--- 6948,6957 ----
  }
  
  
! /* 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)