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

[Ken Raeburn]

Index: emacs/src/intervals.c
diff -c emacs/src/intervals.c:1.115 emacs/src/intervals.c:1.116
*** emacs/src/intervals.c:1.115 Wed Jun 12 09:29:47 2002
--- emacs/src/intervals.c       Sun Jul 14 20:00:36 2002
***************
*** 80,87 ****
      }
    else if (STRINGP (parent))
      {
!       new->total_length = XSTRING (parent)->size;
!       XSTRING (parent)->intervals = new;
        new->position = 0;
      }
  
--- 80,87 ----
      }
    else if (STRINGP (parent))
      {
!       new->total_length = SCHARS (parent);
!       STRING_INTERVALS (parent) = new;
        new->position = 0;
      }
  
***************
*** 452,458 ****
        if (BUFFERP (parent))
        BUF_INTERVALS (XBUFFER (parent)) = interval;
        else if (STRINGP (parent))
!       XSTRING (parent)->intervals = interval;
      }
  
    return interval;
--- 452,458 ----
        if (BUFFERP (parent))
        BUF_INTERVALS (XBUFFER (parent)) = interval;
        else if (STRINGP (parent))
!       STRING_INTERVALS (parent) = interval;
      }
  
    return interval;
***************
*** 1280,1286 ****
        if (BUFFERP (owner))
        BUF_INTERVALS (XBUFFER (owner)) = parent;
        else if (STRINGP (owner))
!       XSTRING (owner)->intervals = parent;
        else
        abort ();
  
--- 1280,1286 ----
        if (BUFFERP (owner))
        BUF_INTERVALS (XBUFFER (owner)) = parent;
        else if (STRINGP (owner))
!       STRING_INTERVALS (owner) = parent;
        else
        abort ();
  
***************
*** 2247,2253 ****
    else if (BUFFERP (object))
      i = find_interval (BUF_INTERVALS (XBUFFER (object)), pos);
    else if (STRINGP (object))
!     i = find_interval (XSTRING (object)->intervals, pos);
    else
      abort ();
  
--- 2247,2253 ----
    else if (BUFFERP (object))
      i = find_interval (BUF_INTERVALS (XBUFFER (object)), pos);
    else if (STRINGP (object))
!     i = find_interval (STRING_INTERVALS (object), pos);
    else
      abort ();
  
***************
*** 2384,2390 ****
      return;
  
    SET_INTERVAL_OBJECT (interval_copy, string);
!   XSTRING (string)->intervals = interval_copy;
  }
  
  /* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.
--- 2384,2390 ----
      return;
  
    SET_INTERVAL_OBJECT (interval_copy, string);
!   STRING_INTERVALS (string) = interval_copy;
  }
  
  /* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.
***************
*** 2396,2405 ****
  {
    INTERVAL i1, i2;
    int pos = 0;
!   int end = XSTRING (s1)->size;
  
!   i1 = find_interval (XSTRING (s1)->intervals, 0);
!   i2 = find_interval (XSTRING (s2)->intervals, 0);
  
    while (pos < end)
      {
--- 2396,2405 ----
  {
    INTERVAL i1, i2;
    int pos = 0;
!   int end = SCHARS (s1);
  
!   i1 = find_interval (STRING_INTERVALS (s1), 0);
!   i2 = find_interval (STRING_INTERVALS (s2), 0);
  
    while (pos < end)
      {