[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src fontset.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] emacs/src fontset.c |
Date: |
Tue, 23 Jun 2009 05:47:47 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 09/06/23 05:47:46
Modified files:
src : fontset.c
Log message:
(fontset_font): Call FONT_DEFERRED_LOG.
(face_for_char): Don't call font_deferred_log here.
(font_for_char): Likewise.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fontset.c?cvsroot=emacs&r1=1.173&r2=1.174
Patches:
Index: fontset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fontset.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -b -r1.173 -r1.174
--- fontset.c 8 Jun 2009 04:33:40 -0000 1.173
+++ fontset.c 23 Jun 2009 05:47:46 -0000 1.174
@@ -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)