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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1054 emacs/src/xdisp.c:1.1055
*** emacs/src/xdisp.c:1.1054    Thu Sep 15 13:16:53 2005
--- emacs/src/xdisp.c   Thu Sep 22 09:39:01 2005
***************
*** 6752,6758 ****
     terminated with a newline when NLFLAG is non-zero.  MULTIBYTE, if
     nonzero, means interpret the contents of M as multibyte.  This
     function calls low-level routines in order to bypass text property
!    hooks, etc. which might not be safe to run.  */
  
  void
  message_dolog (m, nbytes, nlflag, multibyte)
--- 6752,6761 ----
     terminated with a newline when NLFLAG is non-zero.  MULTIBYTE, if
     nonzero, means interpret the contents of M as multibyte.  This
     function calls low-level routines in order to bypass text property
!    hooks, etc. which might not be safe to run.
! 
!    This may GC (insert may run before/after change hooks),
!    so the buffer M must NOT point to a Lisp string.  */
  
  void
  message_dolog (m, nbytes, nlflag, multibyte)
***************
*** 6963,6972 ****
     out any existing message, and let the mini-buffer text show
     through.
  
!    The buffer M must continue to exist until after the echo area gets
!    cleared or some other message gets displayed there.  This means do
!    not pass text that is stored in a Lisp string; do not pass text in
!    a buffer that was alloca'd.  */
  
  void
  message2 (m, nbytes, multibyte)
--- 6966,6972 ----
     out any existing message, and let the mini-buffer text show
     through.
  
!    This may GC, so the buffer M must NOT point to a Lisp string.  */
  
  void
  message2 (m, nbytes, multibyte)
***************
*** 8023,8029 ****
  
     If S is not null, set the message to the first LEN bytes of S.  LEN
     zero means use the whole string.  MULTIBYTE_P non-zero means S is
!    multibyte.  Display the message multibyte in that case.  */
  
  void
  set_message (s, string, nbytes, multibyte_p)
--- 8023,8033 ----
  
     If S is not null, set the message to the first LEN bytes of S.  LEN
     zero means use the whole string.  MULTIBYTE_P non-zero means S is
!    multibyte.  Display the message multibyte in that case.
! 
!    Doesn't GC, as with_echo_area_buffer binds Qinhibit_modification_hooks
!    to t before calling set_message_1 (which calls insert).
!   */
  
  void
  set_message (s, string, nbytes, multibyte_p)