From: Kenichi Handa <handa@m17n.org>
Date: Fri, 11 Jul 2008 07:32:32 +0000 (+0000)
Subject: (fontset_from_font): Cancel the previous change.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/38aaf336a128d023147f798fc52c16d9797ff693

(fontset_from_font): Cancel the previous change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 283f8d9ef5..0580e59f31 100644
--- 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 caa732b6bc..cde956c93d 100644
--- 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));
 }