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

[Ken Raeburn]

Index: emacs/src/textprop.c
diff -c emacs/src/textprop.c:1.131 emacs/src/textprop.c:1.132
*** emacs/src/textprop.c:1.131  Mon Jul 15 02:56:48 2002
--- emacs/src/textprop.c        Tue Jul 16 13:37:14 2002
***************
*** 158,174 ****
      }
    else
      {
!       register struct Lisp_String *s = XSTRING (object);
  
        if (! (0 <= XINT (*begin) && XINT (*begin) <= XINT (*end)
!            && XINT (*end) <= s->size))
        args_out_of_range (*begin, *end);
        XSETFASTINT (*begin, XFASTINT (*begin));
        if (begin != end)
        XSETFASTINT (*end, XFASTINT (*end));
!       i = s->intervals;
  
!       if (s->size == 0)
        return NULL_INTERVAL;
  
        searchpos = XINT (*begin);
--- 158,174 ----
      }
    else
      {
!       int len = SCHARS (object);
  
        if (! (0 <= XINT (*begin) && XINT (*begin) <= XINT (*end)
!            && XINT (*end) <= len))
        args_out_of_range (*begin, *end);
        XSETFASTINT (*begin, XFASTINT (*begin));
        if (begin != end)
        XSETFASTINT (*end, XFASTINT (*end));
!       i = STRING_INTERVALS (object);
  
!       if (len == 0)
        return NULL_INTERVAL;
  
        searchpos = XINT (*begin);
***************
*** 553,563 ****
      }
    else
      {
-       register struct Lisp_String *s = XSTRING (object);
- 
        beg = 0;
!       end = s->size;
!       i = s->intervals;
      }
  
    if (!(beg <= position && position <= end))
--- 553,561 ----
      }
    else
      {
        beg = 0;
!       end = SCHARS (object);
!       i = STRING_INTERVALS (object);
      }
  
    if (!(beg <= position && position <= end))