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

[Ken Raeburn]

Index: emacs/src/syntax.c
diff -c emacs/src/syntax.c:1.152 emacs/src/syntax.c:1.153
*** emacs/src/syntax.c:1.152    Mon Nov 26 18:37:01 2001
--- emacs/src/syntax.c  Sun Jul 14 20:00:37 2002
***************
*** 908,914 ****
  
    CHECK_STRING (string);
  
!   p = XSTRING (string)->data;
    code = (enum syntaxcode) syntax_spec_code[*p++];
    if (((int) code & 0377) == 0377)
      error ("invalid syntax description letter: %c", p[-1]);
--- 908,914 ----
  
    CHECK_STRING (string);
  
!   p = SDATA (string);
    code = (enum syntaxcode) syntax_spec_code[*p++];
    if (((int) code & 0377) == 0377)
      error ("invalid syntax description letter: %c", p[-1]);
***************
*** 920,926 ****
      {
        int len;
        int character = (STRING_CHAR_AND_LENGTH
!                      (p, STRING_BYTES (XSTRING (string)) - 1, len));
        XSETINT (match, character);
        if (XFASTINT (match) == ' ')
        match = Qnil;
--- 920,926 ----
      {
        int len;
        int character = (STRING_CHAR_AND_LENGTH
!                      (p, SBYTES (string) - 1, len));
        XSETINT (match, character);
        if (XFASTINT (match) == ' ')
        match = Qnil;
***************
*** 1369,1378 ****
    int len;
  
    CHECK_STRING (string);
!   char_ranges = (int *) alloca (XSTRING (string)->size * (sizeof (int)) * 2);
    string_multibyte = STRING_MULTIBYTE (string);
!   str = XSTRING (string)->data;
!   size_byte = STRING_BYTES (XSTRING (string));
  
    /* Adjust the multibyteness of the string to that of the buffer.  */
    if (multibyte != string_multibyte)
--- 1369,1378 ----
    int len;
  
    CHECK_STRING (string);
!   char_ranges = (int *) alloca (SCHARS (string) * (sizeof (int)) * 2);
    string_multibyte = STRING_MULTIBYTE (string);
!   str = SDATA (string);
!   size_byte = SBYTES (string);
  
    /* Adjust the multibyteness of the string to that of the buffer.  */
    if (multibyte != string_multibyte)
***************
*** 1380,1393 ****
        int nbytes;
  
        if (multibyte)
!       nbytes = count_size_as_multibyte (XSTRING (string)->data,
!                                         XSTRING (string)->size);
        else
!       nbytes = XSTRING (string)->size;
        if (nbytes != size_byte)
        {
          str = (unsigned char *) alloca (nbytes);
!         copy_text (XSTRING (string)->data, str, size_byte,
                     string_multibyte, multibyte);
          size_byte = nbytes;
        }
--- 1380,1393 ----
        int nbytes;
  
        if (multibyte)
!       nbytes = count_size_as_multibyte (SDATA (string),
!                                         SCHARS (string));
        else
!       nbytes = SCHARS (string);
        if (nbytes != size_byte)
        {
          str = (unsigned char *) alloca (nbytes);
!         copy_text (SDATA (string), str, size_byte,
                     string_multibyte, multibyte);
          size_byte = nbytes;
        }
***************
*** 1409,1415 ****
    i_byte = 0;
  
    if (i_byte < size_byte
!       && XSTRING (string)->data[0] == '^')
      {
        negate = 1; i_byte++;
      }
--- 1409,1415 ----
    i_byte = 0;
  
    if (i_byte < size_byte
!       && SREF (string, 0) == '^')
      {
        negate = 1; i_byte++;
      }