Mercurial > emacs
diff src/textprop.c @ 46370:40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references
left unchanged for now.
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Mon, 15 Jul 2002 00:00:41 +0000 |
| parents | 1fb8f75062c6 |
| children | ab2bd718aad6 |
line wrap: on
line diff
--- a/src/textprop.c Sun Jul 14 23:54:05 2002 +0000 +++ b/src/textprop.c Mon Jul 15 00:00:41 2002 +0000 @@ -776,7 +776,7 @@ if (NILP (position)) { if (NILP (limit)) - position = make_number (XSTRING (object)->size); + position = make_number (SCHARS (object)); else position = limit; } @@ -842,7 +842,7 @@ if (NILP (position)) { if (NILP (limit)) - position = make_number (XSTRING (object)->size); + position = make_number (SCHARS (object)); else position = limit; } @@ -935,7 +935,7 @@ if (NULL_INTERVAL_P (next)) XSETFASTINT (position, (STRINGP (object) - ? XSTRING (object)->size + ? SCHARS (object) : BUF_ZV (XBUFFER (object)))); else XSETFASTINT (position, next->position); @@ -955,7 +955,7 @@ return limit; if (NILP (limit)) XSETFASTINT (limit, (STRINGP (object) - ? XSTRING (object)->size + ? SCHARS (object) : BUF_ZV (XBUFFER (object)))); if (!(next->position < XFASTINT (limit))) return limit; @@ -1035,7 +1035,7 @@ return limit; if (NILP (limit)) XSETFASTINT (limit, (STRINGP (object) - ? XSTRING (object)->size + ? SCHARS (object) : BUF_ZV (XBUFFER (object)))); if (!(next->position < XFASTINT (limit))) return limit; @@ -1306,12 +1306,12 @@ get rid of its intervals. */ if (NILP (properties) && STRINGP (object) && XFASTINT (start) == 0 - && XFASTINT (end) == XSTRING (object)->size) + && XFASTINT (end) == SCHARS (object)) { - if (! XSTRING (object)->intervals) + if (! STRING_INTERVALS (object)) return Qt; - XSTRING (object)->intervals = 0; + STRING_INTERVALS (object) = 0; return Qt; }