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

[Ken Raeburn]

Index: emacs/src/composite.c
diff -c emacs/src/composite.c:1.20 emacs/src/composite.c:1.21
*** emacs/src/composite.c:1.20  Thu Jul 11 10:09:42 2002
--- emacs/src/composite.c       Sun Jul 14 20:00:36 2002
***************
*** 615,622 ****
        count = SPECPDL_INDEX ();
        GCPRO1 (string);
        stop = end;
!       ptr = XSTRING (string)->data + string_char_to_byte (string, start);
!       pend = ptr + STRING_BYTES (XSTRING (string));
      }
    else
      {
--- 615,622 ----
        count = SPECPDL_INDEX ();
        GCPRO1 (string);
        stop = end;
!       ptr = SDATA (string) + string_char_to_byte (string, start);
!       pend = ptr + SBYTES (string);
      }
    else
      {
***************
*** 650,656 ****
            break;
          stop = end;
          if (STRINGP (string))
!           ptr = XSTRING (string)->data + string_char_to_byte (string, start);
          else
            ptr = CHAR_POS_ADDR (start);
        }
--- 650,656 ----
            break;
          stop = end;
          if (STRINGP (string))
!           ptr = SDATA (string) + string_char_to_byte (string, start);
          else
            ptr = CHAR_POS_ADDR (start);
        }
***************
*** 680,686 ****
                    {
                      start += XINT (val);
                      if (STRINGP (string))
!                       ptr = XSTRING (string)->data + string_char_to_byte 
(string, start);
                      else
                        ptr = CHAR_POS_ADDR (start);
                    }
--- 680,686 ----
                    {
                      start += XINT (val);
                      if (STRINGP (string))
!                       ptr = SDATA (string) + string_char_to_byte (string, 
start);
                      else
                        ptr = CHAR_POS_ADDR (start);
                    }
***************
*** 746,752 ****
  
    if (XINT (start) < 0 ||
        XINT (start) > XINT (end)
!       || XINT (end) > XSTRING (string)->size)
      args_out_of_range (start, end);
  
    compose_text (XINT (start), XINT (end), components, mod_func, string);
--- 746,752 ----
  
    if (XINT (start) < 0 ||
        XINT (start) > XINT (end)
!       || XINT (end) > SCHARS (string))
      args_out_of_range (start, end);
  
    compose_text (XINT (start), XINT (end), components, mod_func, string);
***************
*** 779,785 ****
    if (!NILP (string))
      {
        CHECK_STRING (string);
!       if (XINT (pos) < 0 || XINT (pos) > XSTRING (string)->size)
        args_out_of_range (string, pos);
      }
    else
--- 779,785 ----
    if (!NILP (string))
      {
        CHECK_STRING (string);
!       if (XINT (pos) < 0 || XINT (pos) > SCHARS (string))
        args_out_of_range (string, pos);
      }
    else