(fontset_from_font): Cancel the previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 283f8d9ef5ddc061004aa9c81ba75ffd75908c2b..0580e59f31808cbaeb646c4e92f4950f5597c075 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-11  Kenichi Handa  <handa@m17n.org>
+
+       * fontset.c (fontset_from_font): Cancel the previous change.
+
 2008-07-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * lisp.h:

diff --git a/src/fontset.c b/src/fontset.c
index caa732b6bc6f736f749aecc256d93cd29a46df6f..cde956c93dda6d2ec8a3193c37ab053b96f8ebd4 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1623,6 +1623,7 @@ fontset_from_font (font_object)
   ASET (font_spec, FONT_REGISTRY_INDEX, Qiso10646_1);
   for (i = FONT_WEIGHT_INDEX; i < FONT_EXTRA_INDEX; i++)
     ASET (font_spec, i, Qnil);
+  Fset_fontset_font (name, Qlatin, font_spec, Qnil, Qnil);
   Fset_fontset_font (name, Qnil, font_spec, Qnil, Qnil);
   return XINT (FONTSET_ID (fontset));
 }