From: Kenichi Handa <handa@m17n.org>
Date: Wed, 25 Apr 2007 11:58:35 +0000 (+0000)
Subject: (set_font_frame_param): Adjusted for the change of
X-Git-Tag: emacs-pretest-23.0.90~8295^2~539
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de921524f8ded96f46b74856ca0a74dfac5434d6;p=emacs.git

(set_font_frame_param): Adjusted for the change of
font_open_for_lface.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 4a404f2008c..660fa34d5cf 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4783,7 +4783,8 @@ set_font_frame_param (frame, lface)
 	      font_name = font_find_for_lface (f, &AREF (lface, 0), Qnil);
 	      if (NILP (font_name))
 		error ("No font matches the specified attribute");
-	      font_name = font_open_for_lface (f, &AREF (lface, 0), font_name);
+	      font_name = font_open_for_lface (f, font_name, &AREF (lface, 0),
+					       Qnil);
 	      if (NILP (font_name))
 		error ("No font matches the specified attribute");
 	    }