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

[Ken Raeburn]

Index: emacs/src/msdos.c
diff -c emacs/src/msdos.c:1.175 emacs/src/msdos.c:1.176
*** emacs/src/msdos.c:1.175     Tue Jul  9 05:49:18 2002
--- emacs/src/msdos.c   Sun Jul 14 20:00:36 2002
***************
*** 1454,1462 ****
        end = glyph + row->used[TEXT_AREA];
        if (glyph < end
          && STRINGP (glyph->object)
!         && XSTRING (glyph->object)->intervals
          && glyph->charpos >= 0
!         && glyph->charpos < XSTRING (glyph->object)->size)
        {
          /* If we're on a string with `help-echo' text property,
             arrange for the help to be displayed.  This is done by
--- 1454,1462 ----
        end = glyph + row->used[TEXT_AREA];
        if (glyph < end
          && STRINGP (glyph->object)
!         && STRING_INTERVALS (glyph->object)
          && glyph->charpos >= 0
!         && glyph->charpos < SCHARS (glyph->object))
        {
          /* If we're on a string with `help-echo' text property,
             arrange for the help to be displayed.  This is done by
***************
*** 1738,1744 ****
          else if (NILP (help)
                   && ((STRINGP (glyph->object)
                        && glyph->charpos >= 0
!                       && glyph->charpos < XSTRING (glyph->object)->size)
                       || (BUFFERP (glyph->object)
                           && glyph->charpos >= BEGV
                           && glyph->charpos < ZV)))
--- 1738,1744 ----
          else if (NILP (help)
                   && ((STRINGP (glyph->object)
                        && glyph->charpos >= 0
!                       && glyph->charpos < SCHARS (glyph->object))
                       || (BUFFERP (glyph->object)
                           && glyph->charpos >= BEGV
                           && glyph->charpos < ZV)))
***************
*** 2454,2460 ****
        {
          x_set_title (f, val);
          if (termscript)
!           fprintf (termscript, "<TITLE: %s>\n", XSTRING (val)->data);
        }
        else if (EQ (prop, Qcursor_type))
        {
--- 2454,2460 ----
        {
          x_set_title (f, val);
          if (termscript)
!           fprintf (termscript, "<TITLE: %s>\n", SDATA (val));
        }
        else if (EQ (prop, Qcursor_type))
        {
***************
*** 4405,4411 ****
      return Qnil;
  
    tem = Fcopy_sequence (filename);
!   msdos_downcase_filename (XSTRING (tem)->data);
    return tem;
  }
  
--- 4405,4411 ----
      return Qnil;
  
    tem = Fcopy_sequence (filename);
!   msdos_downcase_filename (SDATA (tem));
    return tem;
  }