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

[Kenichi Handa]

Index: emacs/src/charset.c
diff -c emacs/src/charset.c:1.134.6.9 emacs/src/charset.c:1.134.6.10
*** emacs/src/charset.c:1.134.6.9       Mon Jun 28 07:29:19 2004
--- emacs/src/charset.c Tue Aug 17 11:49:18 2004
***************
*** 1319,1329 ****
       Lisp_Object dimension, chars, final_char, charset;
  {
    int id;
  
    CHECK_CHARSET_GET_ID (charset, id);
    check_iso_charset_parameter (dimension, chars, final_char);
! 
!   ISO_CHARSET_TABLE (XINT (dimension), XINT (chars), XINT (final_char)) = id;
    return Qnil;
  }
  
--- 1319,1330 ----
       Lisp_Object dimension, chars, final_char, charset;
  {
    int id;
+   int chars_flag;
  
    CHECK_CHARSET_GET_ID (charset, id);
    check_iso_charset_parameter (dimension, chars, final_char);
!   chars_flag = XINT (chars) == 96;
!   ISO_CHARSET_TABLE (XINT (dimension), chars_flag, XINT (final_char)) = id;
    return Qnil;
  }
  
***************
*** 1917,1925 ****
       Lisp_Object dimension, chars, final_char;
  {
    int id;
  
    check_iso_charset_parameter (dimension, chars, final_char);
!   id = ISO_CHARSET_TABLE (XFASTINT (dimension), XFASTINT (chars),
                          XFASTINT (final_char));
    return (id >= 0 ? CHARSET_NAME (CHARSET_FROM_ID (id)) : Qnil);
  }
--- 1918,1928 ----
       Lisp_Object dimension, chars, final_char;
  {
    int id;
+   int chars_flag;
  
    check_iso_charset_parameter (dimension, chars, final_char);
!   chars_flag = XFASTINT (chars) == 96;
!   id = ISO_CHARSET_TABLE (XFASTINT (dimension), chars_flag,
                          XFASTINT (final_char));
    return (id >= 0 ? CHARSET_NAME (CHARSET_FROM_ID (id)) : Qnil);
  }