# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1227923123 0
# Node ID b25e28d70fad3c7d1a584d40ddf20eaa1e79ee21
# Parent  811c2c99eed5969ad4dad74ff228249291bed679
(Fdefine_charset_internal): After calculating
min_char, max_char, and fastmap, copy the charset structure again.
(encode_char): Fix the previous change.

diff -r 811c2c99eed5 -r b25e28d70fad src/charset.c
--- a/src/charset.c	Fri Nov 28 23:54:23 2008 +0000
+++ b/src/charset.c	Sat Nov 29 01:45:23 2008 +0000
@@ -1199,7 +1199,10 @@
   charset_table[id] = charset;
 
   if (charset.method == CHARSET_METHOD_MAP)
-    load_charset (&charset, 0);
+    {
+      load_charset (&charset, 0);
+      charset_table[id] = charset;
+    }
 
   if (charset.iso_final >= 0)
     {
@@ -1855,8 +1858,11 @@
 
       encoder = CHARSET_ENCODER (charset);
       if (! CHAR_TABLE_P (CHARSET_ENCODER (charset)))
-	load_charset (charset);
-      if (CHAR_TABLE_P (CHARSET_ENCODER (charset)))
+	{
+	  load_charset (charset, 2);
+	  encoder = CHARSET_ENCODER (charset);
+	}
+      if (CHAR_TABLE_P (encoder))
 	{
 	  val = CHAR_TABLE_REF (encoder, c);
 	  if (NILP (val))