diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-06-23 05:47:46 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-06-23 05:47:46 +0000 |
| commit | b23bf85abc498269dd30ac0ecc305ed836c59c74 (patch) | |
| tree | cf183771c3494cdd47a7db63a2170b86777ff529 /src/fontset.c | |
| parent | d4a885b2d7c3cee4bec2eccc5cf358a974a70054 (diff) | |
| download | emacs-b23bf85abc498269dd30ac0ecc305ed836c59c74.tar.gz | |
(fontset_font): Call FONT_DEFERRED_LOG.
(face_for_char): Don't call font_deferred_log here.
(font_for_char): Likewise.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fontset.c b/src/fontset.c index 8f3fcd3d17d..08a011306c5 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -687,6 +687,7 @@ fontset_font (fontset, c, face, id) Lisp_Object base_fontset; /* Try a font-group of FONTSET. */ + FONT_DEFERRED_LOG ("current fontset: font for", make_number (c), Qnil); rfont_def = fontset_find_font (fontset, c, face, id, 0); if (VECTORP (rfont_def)) return rfont_def; @@ -700,6 +701,7 @@ fontset_font (fontset, c, face, id) if (NILP (FONTSET_DEFAULT (fontset))) FONTSET_DEFAULT (fontset) = make_fontset (FONTSET_FRAME (fontset), Qnil, Vdefault_fontset); + FONT_DEFERRED_LOG ("default fontset: font for", make_number (c), Qnil); rfont_def = fontset_find_font (FONTSET_DEFAULT (fontset), c, face, id, 0); if (VECTORP (rfont_def)) return rfont_def; @@ -708,6 +710,7 @@ fontset_font (fontset, c, face, id) } /* Try a fallback font-group of FONTSET. */ + FONT_DEFERRED_LOG ("current fallback: font for", make_number (c), Qnil); rfont_def = fontset_find_font (fontset, c, face, id, 1); if (VECTORP (rfont_def)) return rfont_def; @@ -717,6 +720,7 @@ fontset_font (fontset, c, face, id) /* Try a fallback font-group of the default fontset . */ if (! EQ (base_fontset, Vdefault_fontset)) { + FONT_DEFERRED_LOG ("default fallback: font for", make_number (c), Qnil); rfont_def = fontset_find_font (FONTSET_DEFAULT (fontset), c, face, id, 1); if (VECTORP (rfont_def)) return rfont_def; @@ -917,7 +921,6 @@ face_for_char (f, face, c, pos, object) id = -1; } - font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil); rfont_def = fontset_font (fontset, c, face, id); if (VECTORP (rfont_def)) { @@ -989,7 +992,6 @@ font_for_char (face, c, pos, object) id = -1; } - font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil); rfont_def = fontset_font (fontset, c, face, id); return (VECTORP (rfont_def) ? RFONT_DEF_OBJECT (rfont_def) |