Mercurial > emacs

changeset 103541:1a80fde577a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(fontset_font): Call FONT_DEFERRED_LOG. (face_for_char): Don't call font_deferred_log here. (font_for_char): Likewise.
author Kenichi Handa <handa@m17n.org>
date Tue, 23 Jun 2009 05:47:46 +0000
parents f3b73b1ef467
children 01b5e53f519a
files src/fontset.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontset.c	Tue Jun 23 02:13:45 2009 +0000
+++ b/src/fontset.c	Tue Jun 23 05:47:46 2009 +0000
@@ -687,6 +687,7 @@
   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 @@
       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 @@
     }
 
   /* 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 @@
   /* 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 @@
 	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 @@
 	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)