From: Kenichi Handa <handa@m17n.org>
Date: Tue, 23 Jun 2009 05:47:46 +0000 (+0000)
Subject: (fontset_font): Call FONT_DEFERRED_LOG.
X-Git-Tag: emacs-pretest-23.1.90~2460
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b23bf85abc498269dd30ac0ecc305ed836c59c74;p=emacs.git

(fontset_font): Call FONT_DEFERRED_LOG.
(face_for_char): Don't call font_deferred_log here.
(font_for_char): Likewise.
---

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)