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

[Ken Raeburn]

Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.309 emacs/src/dispnew.c:1.310
*** emacs/src/dispnew.c:1.309   Thu Jul 11 10:10:17 2002
--- emacs/src/dispnew.c Sun Jul 14 20:00:36 2002
***************
*** 379,385 ****
           w,
           ((BUFFERP (w->buffer)
             && STRINGP (XBUFFER (w->buffer)->name))
!           ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data
            : "???"),
           paused_p ? " ***paused***" : "");
    strcat (buf, msg);
--- 379,385 ----
           w,
           ((BUFFERP (w->buffer)
             && STRINGP (XBUFFER (w->buffer)->name))
!           ? (char *) SDATA (XBUFFER (w->buffer)->name)
            : "???"),
           paused_p ? " ***paused***" : "");
    strcat (buf, msg);
***************
*** 6058,6064 ****
    if (! NILP (file))
      {
        file = Fexpand_file_name (file, Qnil);
!       termscript = fopen (XSTRING (file)->data, "w");
        if (termscript == 0)
        report_file_error ("Opening termscript", Fcons (file, Qnil));
      }
--- 6058,6064 ----
    if (! NILP (file))
      {
        file = Fexpand_file_name (file, Qnil);
!       termscript = fopen (SDATA (file), "w");
        if (termscript == 0)
        report_file_error ("Opening termscript", Fcons (file, Qnil));
      }
***************
*** 6075,6085 ****
  {
    /* ??? Perhaps we should do something special for multibyte strings here.  
*/
    CHECK_STRING (string);
!   fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), stdout);
    fflush (stdout);
    if (termscript)
      {
!       fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)),
              termscript);
        fflush (termscript);
      }
--- 6075,6085 ----
  {
    /* ??? Perhaps we should do something special for multibyte strings here.  
*/
    CHECK_STRING (string);
!   fwrite (SDATA (string), 1, SBYTES (string), stdout);
    fflush (stdout);
    if (termscript)
      {
!       fwrite (SDATA (string), 1, SBYTES (string),
              termscript);
        fflush (termscript);
      }
***************
*** 6330,6336 ****
      {
        buf = XCDR (XCAR (tail));
        /* Ignore buffers that aren't included in buffer lists.  */
!       if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ')
        continue;
        if (!EQ (*vecp++, buf))
        goto changed;
--- 6330,6336 ----
      {
        buf = XCDR (XCAR (tail));
        /* Ignore buffers that aren't included in buffer lists.  */
!       if (SREF (XBUFFER (buf)->name, 0) == ' ')
        continue;
        if (!EQ (*vecp++, buf))
        goto changed;
***************
*** 6364,6370 ****
      {
        buf = XCDR (XCAR (tail));
        /* Ignore buffers that aren't included in buffer lists.  */
!       if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ')
        continue;
        *vecp++ = buf;
        *vecp++ = XBUFFER (buf)->read_only;
--- 6364,6370 ----
      {
        buf = XCDR (XCAR (tail));
        /* Ignore buffers that aren't included in buffer lists.  */
!       if (SREF (XBUFFER (buf)->name, 0) == ' ')
        continue;
        *vecp++ = buf;
        *vecp++ = XBUFFER (buf)->read_only;