/[emacs]/emacs/src/intervals.c
ViewVC logotype

Diff of /emacs/src/intervals.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.115 by monnier, Wed Jun 12 13:29:47 2002 UTC revision 1.116 by raeburn, Mon Jul 15 00:00:36 2002 UTC
# Line 80  create_root_interval (parent) Line 80  create_root_interval (parent)
80      }      }
81    else if (STRINGP (parent))    else if (STRINGP (parent))
82      {      {
83        new->total_length = XSTRING (parent)->size;        new->total_length = SCHARS (parent);
84        XSTRING (parent)->intervals = new;        STRING_INTERVALS (parent) = new;
85        new->position = 0;        new->position = 0;
86      }      }
87    
# Line 452  balance_possible_root_interval (interval Line 452  balance_possible_root_interval (interval
452        if (BUFFERP (parent))        if (BUFFERP (parent))
453          BUF_INTERVALS (XBUFFER (parent)) = interval;          BUF_INTERVALS (XBUFFER (parent)) = interval;
454        else if (STRINGP (parent))        else if (STRINGP (parent))
455          XSTRING (parent)->intervals = interval;          STRING_INTERVALS (parent) = interval;
456      }      }
457    
458    return interval;    return interval;
# Line 1280  delete_interval (i) Line 1280  delete_interval (i)
1280        if (BUFFERP (owner))        if (BUFFERP (owner))
1281          BUF_INTERVALS (XBUFFER (owner)) = parent;          BUF_INTERVALS (XBUFFER (owner)) = parent;
1282        else if (STRINGP (owner))        else if (STRINGP (owner))
1283          XSTRING (owner)->intervals = parent;          STRING_INTERVALS (owner) = parent;
1284        else        else
1285          abort ();          abort ();
1286    
# Line 2247  get_property_and_range (pos, prop, val, Line 2247  get_property_and_range (pos, prop, val,
2247    else if (BUFFERP (object))    else if (BUFFERP (object))
2248      i = find_interval (BUF_INTERVALS (XBUFFER (object)), pos);      i = find_interval (BUF_INTERVALS (XBUFFER (object)), pos);
2249    else if (STRINGP (object))    else if (STRINGP (object))
2250      i = find_interval (XSTRING (object)->intervals, pos);      i = find_interval (STRING_INTERVALS (object), pos);
2251    else    else
2252      abort ();      abort ();
2253    
# Line 2384  copy_intervals_to_string (string, buffer Line 2384  copy_intervals_to_string (string, buffer
2384      return;      return;
2385    
2386    SET_INTERVAL_OBJECT (interval_copy, string);    SET_INTERVAL_OBJECT (interval_copy, string);
2387    XSTRING (string)->intervals = interval_copy;    STRING_INTERVALS (string) = interval_copy;
2388  }  }
2389    
2390  /* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.  /* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.
# Line 2396  compare_string_intervals (s1, s2) Line 2396  compare_string_intervals (s1, s2)
2396  {  {
2397    INTERVAL i1, i2;    INTERVAL i1, i2;
2398    int pos = 0;    int pos = 0;
2399    int end = XSTRING (s1)->size;    int end = SCHARS (s1);
2400    
2401    i1 = find_interval (XSTRING (s1)->intervals, 0);    i1 = find_interval (STRING_INTERVALS (s1), 0);
2402    i2 = find_interval (XSTRING (s2)->intervals, 0);    i2 = find_interval (STRING_INTERVALS (s2), 0);
2403    
2404    while (pos < end)    while (pos < end)
2405      {      {

Legend:
Removed from v.1.115  
changed lines
  Added in v.1.116

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26