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

[Ken Raeburn]

Index: emacs/src/data.c
diff -c emacs/src/data.c:1.212 emacs/src/data.c:1.213
*** emacs/src/data.c:1.212      Sun Jul 14 20:00:36 2002
--- emacs/src/data.c    Tue Jul 16 11:49:07 2002
***************
*** 1833,1839 ****
        return make_number ((unsigned char) SREF (array, idxval));
        idxval_byte = string_char_to_byte (array, idxval);
  
!       c = STRING_CHAR (&SREF (array, idxval_byte),
                       SBYTES (array) - idxval_byte);
        return make_number (c);
      }
--- 1833,1839 ----
        return make_number ((unsigned char) SREF (array, idxval));
        idxval_byte = string_char_to_byte (array, idxval);
  
!       c = STRING_CHAR (SDATA (array) + idxval_byte,
                       SBYTES (array) - idxval_byte);
        return make_number (c);
      }
***************
*** 2031,2037 ****
        CHECK_NUMBER (newelt);
  
        idxval_byte = string_char_to_byte (array, idxval);
!       p1 = &SREF (array, idxval_byte);
        PARSE_MULTIBYTE_SEQ (p1, nbytes - idxval_byte, prev_bytes);
        new_bytes = CHAR_STRING (XINT (newelt), p0);
        if (prev_bytes != new_bytes)
--- 2031,2037 ----
        CHECK_NUMBER (newelt);
  
        idxval_byte = string_char_to_byte (array, idxval);
!       p1 = SDATA (array) + idxval_byte;
        PARSE_MULTIBYTE_SEQ (p1, nbytes - idxval_byte, prev_bytes);
        new_bytes = CHAR_STRING (XINT (newelt), p0);
        if (prev_bytes != new_bytes)
***************
*** 2065,2071 ****
        CHECK_NUMBER (newelt);
  
        if (XINT (newelt) < 0 || SINGLE_BYTE_CHAR_P (XINT (newelt)))
!       SREF (array, idxval) = XINT (newelt);
        else
        {
          /* We must relocate the string data while converting it to
--- 2065,2071 ----
        CHECK_NUMBER (newelt);
  
        if (XINT (newelt) < 0 || SINGLE_BYTE_CHAR_P (XINT (newelt)))
!       SSET (array, idxval, XINT (newelt));
        else
        {
          /* We must relocate the string data while converting it to