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

[Kenichi Handa]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.289.2.8 emacs/src/coding.c:1.289.2.9
*** emacs/src/coding.c:1.289.2.8        Sat Nov 22 06:39:53 2003
--- emacs/src/coding.c  Sat Nov 22 21:17:20 2003
***************
*** 8107,8113 ****
  
    if (EQ (coding_type, Qcharset))
      {
-       Lisp_Object list;
        /* Generate a lisp vector of 256 elements.  Each element is nil,
         integer, or a list of charset IDs.
  
--- 8107,8112 ----
***************
*** 8119,8126 ****
  
         If Nth element is a list of charset IDs, N is the first byte
         of one of them.  The list is sorted by dimensions of the
!        charsets.  A charset of smaller dimension comes firtst.
!       */
        for (list = Qnil, tail = charset_list; CONSP (tail); tail = XCDR (tail))
        {
          struct charset *charset = CHARSET_FROM_ID (XFASTINT (XCAR (tail)));
--- 8118,8127 ----
  
         If Nth element is a list of charset IDs, N is the first byte
         of one of them.  The list is sorted by dimensions of the
!        charsets.  A charset of smaller dimension comes firtst. */
!       Lisp_Object list;
!       int maybe_ascii_compatible = 1;
! 
        for (list = Qnil, tail = charset_list; CONSP (tail); tail = XCDR (tail))
        {
          struct charset *charset = CHARSET_FROM_ID (XFASTINT (XCAR (tail)));
***************
*** 8130,8135 ****
--- 8131,8137 ----
              val = CHARSET_SUPERSET (charset);
              for (; CONSP (val); val = XCDR (val))
                list = Fcons (XCAR (XCAR (val)), list);
+             maybe_ascii_compatible = 0;
            }
          else
            list = Fcons (XCAR (tail), list);
***************
*** 8143,8149 ****
          int dim = CHARSET_DIMENSION (charset);
          int idx = (dim - 1) * 4;
  
!         if (CHARSET_ASCII_COMPATIBLE_P (charset))
            CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
  
          for (i = charset->code_space[idx];
--- 8145,8152 ----
          int dim = CHARSET_DIMENSION (charset);
          int idx = (dim - 1) * 4;
  
!         if (CHARSET_ASCII_COMPATIBLE_P (charset)
!             && maybe_ascii_compatible)
            CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
  
          for (i = charset->code_space[idx];