# HG changeset patch
# User Kenichi Handa  <handa@m17n.org>
# Date 1262692159 -32400
# Node ID 562e48429719ca6c76d99579beca389ee625821f
# Parent  a92501a579373f9d027e0b91b92fa1d8a2cd7478
fontset.c (fontset_find_font): Fix getting the frame pointer.

diff -r a92501a57937 -r 562e48429719 src/ChangeLog
--- a/src/ChangeLog	Tue Jan 05 20:42:19 2010 +0900
+++ b/src/ChangeLog	Tue Jan 05 20:49:19 2010 +0900
@@ -1,3 +1,7 @@
+2010-01-05  Kenichi Handa  <handa@m17n.org>
+
+	* fontset.c (fontset_find_font): Fix getting the frame pointer.
+
 2010-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* dbusbind.c (xd_remove_watch): Avoid trying to convert a void* to
diff -r a92501a57937 -r 562e48429719 src/fontset.c
--- a/src/fontset.c	Tue Jan 05 20:42:19 2010 +0900
+++ b/src/fontset.c	Tue Jan 05 20:49:19 2010 +0900
@@ -533,8 +533,8 @@
 {
   Lisp_Object vec, font_group;
   int i, charset_matched = 0, found_index;
-  FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset)))
-    ? XFRAME (selected_frame) : XFRAME (FONTSET_FRAME (fontset));
+  FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset))
+		 ? XFRAME (FONTSET_FRAME (fontset)) : XFRAME (selected_frame));
   Lisp_Object rfont_def;
 
   font_group = fontset_get_font_group (fontset, fallback ? -1 : c);