From: Kenichi Handa <handa@m17n.org>
Date: Tue, 20 May 2003 13:05:14 +0000 (+0000)
Subject: (Fdefine_coding_system_internal): Fix for the case that
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~44
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4187a77da78d6decbcf8d38ba00179d98d6920d5;p=emacs.git

(Fdefine_coding_system_internal): Fix for the case that
coding_type is Qcharset.
---

diff --git a/src/coding.c b/src/coding.c
index 19d9ebfc68c..9b295d7d870 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7835,6 +7835,7 @@ usage: (define-coding-system-internal ...)  */)
 
   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.
 
@@ -7848,9 +7849,23 @@ usage: (define-coding-system-internal ...)  */)
 	 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)));
+
+	  if (charset->method == CHARSET_METHOD_SUPERSET)
+	    {
+	      val = CHARSET_SUPERSET (charset);
+	      for (; CONSP (val); val = XCDR (val))
+		list = Fcons (XCAR (XCAR (val)), list); 
+	    }
+	  else
+	    list = Fcons (XCAR (tail), list);
+	}
+
       val = Fmake_vector (make_number (256), Qnil);
 
-      for (tail = charset_list; CONSP (tail); tail = XCDR (tail))
+      for (tail = Fnreverse (list); CONSP (tail); tail = XCDR (tail))
 	{
 	  struct charset *charset = CHARSET_FROM_ID (XFASTINT (XCAR (tail)));
 	  int dim = CHARSET_DIMENSION (charset);