From: Kenichi Handa <handa@m17n.org>
Date: Fri, 20 Jun 2008 06:12:33 +0000 (+0000)
Subject: (fontset_from_font): Copy font_spec before changing
X-Git-Tag: emacs-pretest-23.0.90~4662
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b9cd864a84146e0de8c4ddb2f19e2aca5f4ffbf;p=emacs.git

(fontset_from_font): Copy font_spec before changing
the elements.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4408c59cf37..f005d1bf702 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-06-20  Kenichi Handa  <handa@m17n.org>
 
+	* fontset.c (fontset_from_font): Copy font_spec before changing
+	the elements.
+
 	* xfns.c (x_default_font_parameter): Try "monospace-12" too.
 
 2008-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/src/fontset.c b/src/fontset.c
index e81f6e16c76..29a0bd4f1d1 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1633,6 +1633,7 @@ fontset_from_font (font_object)
   Vfontset_alias_alist = Fcons (Fcons (name, alias), Vfontset_alias_alist);
   auto_fontset_alist = Fcons (Fcons (font_spec, fontset), auto_fontset_alist);
   FONTSET_ASCII (fontset) = font_name;
+  font_spec = Fcopy_font_spec (font_spec);
   ASET (font_spec, FONT_FOUNDRY_INDEX, Qnil);
   ASET (font_spec, FONT_ADSTYLE_INDEX, Qnil);
   for (i = FONT_WEIGHT_INDEX; i < FONT_EXTRA_INDEX; i++)