[Emacs-diffs] Changes to emacs/src/fns.c

[Kenichi Handa]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.319 emacs/src/fns.c:1.320
*** emacs/src/fns.c:1.319       Mon Jul 15 02:55:28 2002
--- emacs/src/fns.c     Tue Jul 16 11:49:20 2002
***************
*** 799,805 ****
                        += CHAR_STRING (XINT (elt),
                                        SDATA (val) + toindex_byte);
                    else
!                     SREF (val, toindex_byte++) = XINT (elt);
                    if (some_multibyte
                        && toindex_byte > 0
                        && count_combining (SDATA (val),
--- 799,805 ----
                        += CHAR_STRING (XINT (elt),
                                        SDATA (val) + toindex_byte);
                    else
!                     SSET (val, toindex_byte++, XINT (elt));
                    if (some_multibyte
                        && toindex_byte > 0
                        && count_combining (SDATA (val),
***************
*** 815,821 ****
                    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);
  
                    toindex_byte += CHAR_STRING (c, p);
                    toindex++;
--- 815,821 ----
                    int c = XINT (elt);
                    /* P exists as a variable
                       to avoid a bug on the Masscomp C compiler.  */
!                   unsigned char *p = SDATA (val) + toindex_byte;
  
                    toindex_byte += CHAR_STRING (c, p);
                    toindex++;
***************
*** 1698,1704 ****
        {
          if (STRING_MULTIBYTE (seq))
            {
!             c = STRING_CHAR (&SREF (seq, ibyte),
                               SBYTES (seq) - ibyte);
              cbytes = CHAR_BYTES (c);
            }
--- 1698,1704 ----
        {
          if (STRING_MULTIBYTE (seq))
            {
!             c = STRING_CHAR (SDATA (seq) + ibyte,
                               SBYTES (seq) - ibyte);
              cbytes = CHAR_BYTES (c);
            }
***************
*** 1729,1735 ****
            {
              if (STRING_MULTIBYTE (seq))
                {
!                 c = STRING_CHAR (&SREF (seq, ibyte),
                                   SBYTES (seq) - ibyte);
                  cbytes = CHAR_BYTES (c);
                }
--- 1729,1735 ----
            {
              if (STRING_MULTIBYTE (seq))
                {
!                 c = STRING_CHAR (SDATA (seq) + ibyte,
                                   SBYTES (seq) - ibyte);
                  cbytes = CHAR_BYTES (c);
                }
***************
*** 1741,1748 ****
  
              if (!INTEGERP (elt) || c != XINT (elt))
                {
!                 unsigned char *from = &SREF (seq, ibyte);
!                 unsigned char *to   = &SREF (tem, nbytes);
                  EMACS_INT n;
  
                  ++nchars;
--- 1741,1748 ----
  
              if (!INTEGERP (elt) || c != XINT (elt))
                {
!                 unsigned char *from = SDATA (seq) + ibyte;
!                 unsigned char *to   = SDATA (tem) + nbytes;
                  EMACS_INT n;
  
                  ++nchars;