fontset.c (fontset_find_font): Fix getting the frame pointer.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6818ec395a4db838ff85c18071da0ca1b86a7a0f..147ac60fce48019d579b1e4708175e3f48cd691a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/fontset.c b/src/fontset.c
index 30620e511c8abf2b252edd10586daf18d55979c4..b62c779be70b3f5f7c9f2bedf5f2e06f917ad375 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -533,8 +533,8 @@ fontset_find_font (fontset, c, face, id, fallback)
 {
   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);