Commit 08663750 authored by Ken Raeburn's avatar Ken Raeburn
Browse files

* fns.c (concat): Use SSET.

(concat, Fdelete): Use SDATA.
parent 942dc838
...@@ -799,7 +799,7 @@ concat (nargs, args, target_type, last_special) ...@@ -799,7 +799,7 @@ concat (nargs, args, target_type, last_special)
+= CHAR_STRING (XINT (elt), += CHAR_STRING (XINT (elt),
SDATA (val) + toindex_byte); SDATA (val) + toindex_byte);
else else
SREF (val, toindex_byte++) = XINT (elt); SSET (val, toindex_byte++, XINT (elt));
if (some_multibyte if (some_multibyte
&& toindex_byte > 0 && toindex_byte > 0
&& count_combining (SDATA (val), && count_combining (SDATA (val),
...@@ -815,7 +815,7 @@ concat (nargs, args, target_type, last_special) ...@@ -815,7 +815,7 @@ concat (nargs, args, target_type, last_special)
int c = XINT (elt); int c = XINT (elt);
/* P exists as a variable /* P exists as a variable
to avoid a bug on the Masscomp C compiler. */ to avoid a bug on the Masscomp C compiler. */
unsigned char *p = & SREF (val, toindex_byte); unsigned char *p = SDATA (val) + toindex_byte;
toindex_byte += CHAR_STRING (c, p); toindex_byte += CHAR_STRING (c, p);
toindex++; toindex++;
...@@ -1698,7 +1698,7 @@ to be sure of changing the value of `foo'. */) ...@@ -1698,7 +1698,7 @@ to be sure of changing the value of `foo'. */)
{ {
if (STRING_MULTIBYTE (seq)) if (STRING_MULTIBYTE (seq))
{ {
c = STRING_CHAR (&SREF (seq, ibyte), c = STRING_CHAR (SDATA (seq) + ibyte,
SBYTES (seq) - ibyte); SBYTES (seq) - ibyte);
cbytes = CHAR_BYTES (c); cbytes = CHAR_BYTES (c);
} }
...@@ -1729,7 +1729,7 @@ to be sure of changing the value of `foo'. */) ...@@ -1729,7 +1729,7 @@ to be sure of changing the value of `foo'. */)
{ {
if (STRING_MULTIBYTE (seq)) if (STRING_MULTIBYTE (seq))
{ {
c = STRING_CHAR (&SREF (seq, ibyte), c = STRING_CHAR (SDATA (seq) + ibyte,
SBYTES (seq) - ibyte); SBYTES (seq) - ibyte);
cbytes = CHAR_BYTES (c); cbytes = CHAR_BYTES (c);
} }
...@@ -1741,8 +1741,8 @@ to be sure of changing the value of `foo'. */) ...@@ -1741,8 +1741,8 @@ to be sure of changing the value of `foo'. */)
if (!INTEGERP (elt) || c != XINT (elt)) if (!INTEGERP (elt) || c != XINT (elt))
{ {
unsigned char *from = &SREF (seq, ibyte); unsigned char *from = SDATA (seq) + ibyte;
unsigned char *to = &SREF (tem, nbytes); unsigned char *to = SDATA (tem) + nbytes;
EMACS_INT n; EMACS_INT n;
++nchars; ++nchars;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment