diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-01-05 20:49:19 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-01-05 20:49:19 +0900 |
| commit | 2a1ef5be4980dee796a0f7552370e70a298c0b3b (patch) | |
| tree | 1bb539cdcf186e23c54f705232d63215273b988f | |
| parent | b25d6a02fdbde0f9f9491c0f7d4abe1400d9170e (diff) | |
| download | emacs-2a1ef5be4980dee796a0f7552370e70a298c0b3b.tar.gz | |
fontset.c (fontset_find_font): Fix getting the frame pointer.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fontset.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6818ec395a4..147ac60fce4 100644 --- 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 30620e511c8..b62c779be70 100644 --- 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); |