Mercurial > emacs
changeset 106735:b12f3cb1fe53
fontset.c (fontset_find_font): Fix getting the frame pointer.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 05 Jan 2010 20:53:11 +0900 |
| parents | d804f575197b (current diff) 562e48429719 (diff) |
| children | 8d23ea9e4ab1 6efbdb23aea3 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jan 04 23:46:35 2010 -0800 +++ b/src/ChangeLog Tue Jan 05 20:53:11 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
--- a/src/fontset.c Mon Jan 04 23:46:35 2010 -0800 +++ b/src/fontset.c Tue Jan 05 20:53:11 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);