From: Kenichi Handa <handa@m17n.org>
Date: Thu, 22 May 2008 02:21:54 +0000 (+0000)
Subject: (fontset_from_font, Ffontset_info): Add the 2nd arg in
X-Git-Tag: emacs-pretest-23.0.90~5375
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ae2e7f020a969c423305e641db3a0327b77fdef;p=emacs.git

(fontset_from_font, Ffontset_info): Add the 2nd arg in
call of Ffont_xlfd_name.
---

diff --git a/src/fontset.c b/src/fontset.c
index 92c9f2a2268..e2fafbb932f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1602,7 +1602,7 @@ fontset_from_font (font_object)
     }
   fontset_spec = Fcopy_font_spec (font_spec);
   ASET (fontset_spec, FONT_REGISTRY_INDEX, alias);
-  name = Ffont_xlfd_name (fontset_spec);
+  name = Ffont_xlfd_name (fontset_spec, Qnil);
   if (NILP (name))
     abort ();
   fontset = make_fontset (Qnil, name, Qnil);
@@ -1905,7 +1905,7 @@ fontset.  The format is the same as above.  */)
 	      for (; CONSP (alist); alist = XCDR (alist))
 		{
 		  elt = XCAR (alist);
-		  XSETCAR (elt, Ffont_xlfd_name (XCAR (elt)));
+		  XSETCAR (elt, Ffont_xlfd_name (XCAR (elt), Qnil));
 		}
 	    }
 	  c = to + 1;