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

[Ken Raeburn]

Index: emacs/src/textprop.c
diff -c emacs/src/textprop.c:1.129 emacs/src/textprop.c:1.130
*** emacs/src/textprop.c:1.129  Thu Jul 11 10:15:24 2002
--- emacs/src/textprop.c        Sun Jul 14 20:00:37 2002
***************
*** 776,782 ****
        if (NILP (position))
        {
          if (NILP (limit))
!           position = make_number (XSTRING (object)->size);
          else
            position = limit;
        }
--- 776,782 ----
        if (NILP (position))
        {
          if (NILP (limit))
!           position = make_number (SCHARS (object));
          else
            position = limit;
        }
***************
*** 842,848 ****
        if (NILP (position))
        {
          if (NILP (limit))
!           position = make_number (XSTRING (object)->size);
          else
            position = limit;
        }
--- 842,848 ----
        if (NILP (position))
        {
          if (NILP (limit))
!           position = make_number (SCHARS (object));
          else
            position = limit;
        }
***************
*** 935,941 ****
        
        if (NULL_INTERVAL_P (next))
        XSETFASTINT (position, (STRINGP (object)
!                               ? XSTRING (object)->size
                                : BUF_ZV (XBUFFER (object))));
        else
        XSETFASTINT (position, next->position);
--- 935,941 ----
        
        if (NULL_INTERVAL_P (next))
        XSETFASTINT (position, (STRINGP (object)
!                               ? SCHARS (object)
                                : BUF_ZV (XBUFFER (object))));
        else
        XSETFASTINT (position, next->position);
***************
*** 955,961 ****
      return limit;
    if (NILP (limit))
      XSETFASTINT (limit, (STRINGP (object)
!                        ? XSTRING (object)->size
                         : BUF_ZV (XBUFFER (object))));
    if (!(next->position < XFASTINT (limit)))
      return limit;
--- 955,961 ----
      return limit;
    if (NILP (limit))
      XSETFASTINT (limit, (STRINGP (object)
!                        ? SCHARS (object)
                         : BUF_ZV (XBUFFER (object))));
    if (!(next->position < XFASTINT (limit)))
      return limit;
***************
*** 1035,1041 ****
      return limit;
    if (NILP (limit))
      XSETFASTINT (limit, (STRINGP (object)
!                        ? XSTRING (object)->size
                         : BUF_ZV (XBUFFER (object))));
    if (!(next->position < XFASTINT (limit)))
      return limit;
--- 1035,1041 ----
      return limit;
    if (NILP (limit))
      XSETFASTINT (limit, (STRINGP (object)
!                        ? SCHARS (object)
                         : BUF_ZV (XBUFFER (object))));
    if (!(next->position < XFASTINT (limit)))
      return limit;
***************
*** 1306,1317 ****
       get rid of its intervals.  */
    if (NILP (properties) && STRINGP (object)
        && XFASTINT (start) == 0
!       && XFASTINT (end) == XSTRING (object)->size)
      {
!       if (! XSTRING (object)->intervals)
        return Qt;
  
!       XSTRING (object)->intervals = 0;
        return Qt;
      }
  
--- 1306,1317 ----
       get rid of its intervals.  */
    if (NILP (properties) && STRINGP (object)
        && XFASTINT (start) == 0
!       && XFASTINT (end) == SCHARS (object))
      {
!       if (! STRING_INTERVALS (object))
        return Qt;
  
!       STRING_INTERVALS (object) = 0;
        return Qt;
      }