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

[Gerd Moellmann]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.734 emacs/src/xdisp.c:1.735
*** emacs/src/xdisp.c:1.734     Tue Mar  5 05:51:20 2002
--- emacs/src/xdisp.c   Wed Mar  6 09:03:07 2002
***************
*** 6063,6081 ****
         cmd_error, so this must be just an informative message; toss it.  */
        if (FRAME_MESSAGE_BUF (f))
        {
!         int len;
!         char *a[1];
!         a[0] = (char *) XSTRING (string)->data;
  
!         len = doprnt (FRAME_MESSAGE_BUF (f),
!                       FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a);
  
          if (log)
!           message2 (FRAME_MESSAGE_BUF (f), len,
!                     STRING_MULTIBYTE (string));
          else
!           message2_nolog (FRAME_MESSAGE_BUF (f), len,
!                           STRING_MULTIBYTE (string));
  
          /* Print should start at the beginning of the message
             buffer next time.  */
--- 6063,6086 ----
         cmd_error, so this must be just an informative message; toss it.  */
        if (FRAME_MESSAGE_BUF (f))
        {
!         Lisp_Object args[2], message;
!         struct gcpro gcpro1, gcpro2;
  
!         args[0] = build_string (m);
!         args[1] = message = string;
!         GCPRO2 (args, message);
!         gcpro1.nvars = 2;
!         
!         message = Fformat (2, args);
  
          if (log)
!           message3 (message, STRING_BYTES (XSTRING (message)),
!                     STRING_MULTIBYTE (message));
          else
!           message3_nolog (message, STRING_BYTES (XSTRING (message)),
!                           STRING_MULTIBYTE (message));
! 
!         UNGCPRO;
  
          /* Print should start at the beginning of the message
             buffer next time.  */