From f6fe7c1d2dd1c89f0c1b9d094ef7d85140bac94b Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Sun, 13 Feb 2011 10:13:08 +0000
Subject: [PATCH] (Fmake_charset): Fix problem for 94^n or 96^n coded-charsets
 with builtin characters.

---
 src/mule-charset.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/mule-charset.c b/src/mule-charset.c
index d8b9630..9ccd480 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1,7 +1,8 @@
 /* Functions to handle multilingual characters.
    Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 1999,2000,2001,2002,2003,2004,2008,2009 MORIOKA Tomohiko
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2009, 2011
+     MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -1874,6 +1875,47 @@ character set.  Recognized properties are:
 	byte_offset = 0;
     }
 
+  if ( (conversion == 0) && NILP (mother) && (min_code > 0) )
+    {
+      switch (chars)
+	{
+	case 94:
+	  switch (dimension)
+	    {
+	    case 1:
+	      conversion = CONVERSION_94;
+	      break;
+	    case 2:
+	      conversion = CONVERSION_94x94;
+	      break;
+	    case 3:
+	      conversion = CONVERSION_94x94x94;
+	      break;
+	    case 4:
+	      conversion = CONVERSION_94x94x94x94;
+	      break;
+	    }
+	  break;
+	case 96:
+	  switch (dimension)
+	    {
+	    case 1:
+	      conversion = CONVERSION_96;
+	      break;
+	    case 2:
+	      conversion = CONVERSION_96x96;
+	      break;
+	    case 3:
+	      conversion = CONVERSION_96x96x96;
+	      break;
+	    case 4:
+	      conversion = CONVERSION_96x96x96x96;
+	      break;
+	    }
+	  break;
+	}
+    }
+
   charset = make_charset (id, name, chars, dimension, columns, graphic,
 			  final, direction, short_name, long_name,
 			  doc_string, registry, iso_ir,
-- 
1.7.10.4