Mercurial > emacs
diff src/buffer.c @ 21244:50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 21 Mar 1998 07:06:14 +0000 |
| parents | e30cebe8ae7c |
| children | a44f9f59c656 |
line wrap: on
line diff
--- a/src/buffer.c Sat Mar 21 06:16:35 1998 +0000 +++ b/src/buffer.c Sat Mar 21 07:06:14 1998 +0000 @@ -2364,9 +2364,9 @@ nbytes = XSTRING (str)->size; else if (! STRING_MULTIBYTE (str)) nbytes = count_size_as_multibyte (XSTRING (str)->data, - XSTRING (str)->size_byte); + STRING_BYTES (XSTRING (str))); else - nbytes = XSTRING (str)->size_byte; + nbytes = STRING_BYTES (XSTRING (str)); ssl->bytes += nbytes; @@ -2376,9 +2376,9 @@ nbytes = XSTRING (str2)->size; else if (! STRING_MULTIBYTE (str2)) nbytes = count_size_as_multibyte (XSTRING (str2)->data, - XSTRING (str2)->size_byte); + STRING_BYTES (XSTRING (str2))); else - nbytes = XSTRING (str2)->size_byte; + nbytes = STRING_BYTES (XSTRING (str2)); ssl->bytes += nbytes; } @@ -2490,7 +2490,8 @@ { int nbytes; tem = overlay_tails.buf[i].string; - nbytes = copy_text (XSTRING (tem)->data, p, XSTRING (tem)->size_byte, + nbytes = copy_text (XSTRING (tem)->data, p, + STRING_BYTES (XSTRING (tem)), STRING_MULTIBYTE (tem), multibyte); p += nbytes; } @@ -2498,14 +2499,15 @@ { int nbytes; tem = overlay_heads.buf[i].string; - nbytes = copy_text (XSTRING (tem)->data, p, XSTRING (tem)->size_byte, + nbytes = copy_text (XSTRING (tem)->data, p, + STRING_BYTES (XSTRING (tem)), STRING_MULTIBYTE (tem), multibyte); p += nbytes; tem = overlay_heads.buf[i].string2; if (STRINGP (tem)) { nbytes = copy_text (XSTRING (tem)->data, p, - XSTRING (tem)->size_byte, + STRING_BYTES (XSTRING (tem)), STRING_MULTIBYTE (tem), multibyte); p += nbytes; }