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

2a1ef5be · Kenichi Handa · b25d6a02 · 2a1ef5be · 2a1ef5be
Commit 2a1ef5be authored Jan 05, 2010 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

src/ChangeLog src/ChangeLog +4 -0

src/fontset.c src/fontset.c +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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

--- 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);