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

[Ken Raeburn]

Index: emacs/src/charset.c
diff -c emacs/src/charset.c:1.130 emacs/src/charset.c:1.131
*** emacs/src/charset.c:1.130   Thu Jun 27 12:13:17 2002
--- emacs/src/charset.c Sun Jul 14 20:00:35 2002
***************
*** 700,713 ****
        || !STRINGP (vec[7])
        || !STRINGP (vec[8]))
      error ("Invalid info-vector argument for defining charset %s",
!          XSTRING (SYMBOL_NAME (charset_symbol))->data);
  
    if (NILP (charset_id))
      {
        charset_id = get_new_private_charset_id (XINT (vec[0]), XINT (vec[2]));
        if (XINT (charset_id) == 0)
        error ("There's no room for a new private charset %s",
!              XSTRING (SYMBOL_NAME (charset_symbol))->data);
      }
  
    update_charset_table (charset_id, vec[0], vec[1], vec[2], vec[3],
--- 700,713 ----
        || !STRINGP (vec[7])
        || !STRINGP (vec[8]))
      error ("Invalid info-vector argument for defining charset %s",
!          SDATA (SYMBOL_NAME (charset_symbol)));
  
    if (NILP (charset_id))
      {
        charset_id = get_new_private_charset_id (XINT (vec[0]), XINT (vec[2]));
        if (XINT (charset_id) == 0)
        error ("There's no room for a new private charset %s",
!              SDATA (SYMBOL_NAME (charset_symbol)));
      }
  
    update_charset_table (charset_id, vec[0], vec[1], vec[2], vec[3],
***************
*** 779,785 ****
    if (XINT (final_char) < '0' || XFASTINT (final_char) > '~')
      error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars));
    if ((charset = get_charset_id (charset_symbol)) < 0)
!     error ("Invalid charset %s", XSTRING (SYMBOL_NAME 
(charset_symbol))->data);
  
    ISO_CHARSET_TABLE (dimension, chars, final_char) = charset;
    return Qnil;
--- 779,785 ----
    if (XINT (final_char) < '0' || XFASTINT (final_char) > '~')
      error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars));
    if ((charset = get_charset_id (charset_symbol)) < 0)
!     error ("Invalid charset %s", SDATA (SYMBOL_NAME (charset_symbol)));
  
    ISO_CHARSET_TABLE (dimension, chars, final_char) = charset;
    return Qnil;
***************
*** 943,950 ****
    CHECK_STRING (str);
  
    bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
!   find_charset_in_text (XSTRING (str)->data, XSTRING (str)->size,
!                       STRING_BYTES (XSTRING (str)), charsets, table);
  
    val = Qnil;
    if (charsets[1])
--- 943,950 ----
    CHECK_STRING (str);
  
    bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
!   find_charset_in_text (SDATA (str), SCHARS (str),
!                       SBYTES (str), charsets, table);
  
    val = Qnil;
    if (charsets[1])
***************
*** 1335,1343 ****
       Lisp_Object string;
       int precision, *nchars, *nbytes;
  {
!   int len = XSTRING (string)->size;
!   int len_byte = STRING_BYTES (XSTRING (string));
!   unsigned char *str = XSTRING (string)->data;
    int i = 0, i_byte = 0;
    int width = 0;
    struct Lisp_Char_Table *dp = buffer_display_table ();
--- 1335,1343 ----
       Lisp_Object string;
       int precision, *nchars, *nbytes;
  {
!   int len = SCHARS (string);
!   int len_byte = SBYTES (string);
!   unsigned char *str = SDATA (string);
    int i = 0, i_byte = 0;
    int width = 0;
    struct Lisp_Char_Table *dp = buffer_display_table ();