From 086637505722bcebdeadd690ba30a9028ba38d29 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@raeburn.org>
Date: Tue, 16 Jul 2002 15:49:20 +0000
Subject: [PATCH] * fns.c (concat): Use SSET. (concat, Fdelete): Use SDATA.

---
 src/fns.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fns.c b/src/fns.c
index 1ce66b63fb9..786b61926ad 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -799,7 +799,7 @@ concat (nargs, args, target_type, last_special)
 			+= CHAR_STRING (XINT (elt),
 					SDATA (val) + toindex_byte);
 		    else
-		      SREF (val, toindex_byte++) = XINT (elt);
+		      SSET (val, toindex_byte++, XINT (elt));
 		    if (some_multibyte
 			&& toindex_byte > 0
 			&& count_combining (SDATA (val),
@@ -815,7 +815,7 @@ concat (nargs, args, target_type, last_special)
 		    int c = XINT (elt);
 		    /* P exists as a variable
 		       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++;
@@ -1698,7 +1698,7 @@ to be sure of changing the value of `foo'.  */)
 	{
 	  if (STRING_MULTIBYTE (seq))
 	    {
-	      c = STRING_CHAR (&SREF (seq, ibyte),
+	      c = STRING_CHAR (SDATA (seq) + ibyte,
 			       SBYTES (seq) - ibyte);
 	      cbytes = CHAR_BYTES (c);
 	    }
@@ -1729,7 +1729,7 @@ to be sure of changing the value of `foo'.  */)
 	    {
 	      if (STRING_MULTIBYTE (seq))
 		{
-		  c = STRING_CHAR (&SREF (seq, ibyte),
+		  c = STRING_CHAR (SDATA (seq) + ibyte,
 				   SBYTES (seq) - ibyte);
 		  cbytes = CHAR_BYTES (c);
 		}
@@ -1741,8 +1741,8 @@ to be sure of changing the value of `foo'.  */)
 
 	      if (!INTEGERP (elt) || c != XINT (elt))
 		{
-		  unsigned char *from = &SREF (seq, ibyte);
-		  unsigned char *to   = &SREF (tem, nbytes);
+		  unsigned char *from = SDATA (seq) + ibyte;
+		  unsigned char *to   = SDATA (tem) + nbytes;
 		  EMACS_INT n;
 
 		  ++nchars;
-- 
2.39.5