From: Kenichi Handa <handa@m17n.org>
Date: Fri, 22 Apr 2005 07:11:21 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~832
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9c1591618b888c702de58096036e0790dd375b0;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1d09bde8487..fbf38e28ba1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-22  Kenichi Handa  <handa@m17n.org>
+
+	* fns.c (copy_sub_char_table): Explicitly copy the default value
+	of the sub-chartable.
+
+	* fontset.c (fontset_set): When a sub-chartable is created,
+	explicitly sets the defalt value.
+
 2005-04-22  Kim F. Storm  <storm@cua.dk>
 
 	* fns.c (Fplist_get): Replace by Fsafe_plist_get.
diff --git a/src/fontset.c b/src/fontset.c
index c1de33fcf06..8ef708fa51e 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -353,7 +353,11 @@ fontset_set (fontset, c, newelt)
   for (i = 0; code[i] > 0; i++)
     {
       if (!SUB_CHAR_TABLE_P (*elt))
-	*elt = make_sub_char_table (*elt);
+	{
+	  Lisp_Object val = *elt;
+	  *elt = make_sub_char_table (val);
+	  XCHAR_TABLE (*elt)->defalt = val;
+	}
       elt = &XCHAR_TABLE (*elt)->contents[code[i]];
     }
   if (SUB_CHAR_TABLE_P (*elt))