mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Code Issues Releases Activity

Change font_add_log to FONT_ADD_LOG.

Browse Source
This commit is contained in:
Kenichi Handa 2009-06-23 05:51:00 +00:00
parent f5a0b28161
commit 678dca3ddb
5 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ChangeLog
View File

@ -1,3 +1,17 @@
2009-06-23 Kenichi Handa <handa@m17n.org>
* ftfont.c: Change font_add_log to FONT_ADD_LOG.
* w32font.c: Change font_add_log to FONT_ADD_LOG.
* w32uniscribe.c: Change font_add_log to FONT_ADD_LOG.
* xfont.c: Change font_add_log to FONT_ADD_LOG.
* fontset.c (fontset_font): Call FONT_DEFERRED_LOG.
(face_for_char): Don't call font_deferred_log here.
(font_for_char): Likewise.
2009-06-22 Chong Yidong <cyd@stupidchicken.com>
* w32term.c (x_draw_glyph_string): Use the glyph string's width

4
src/ftfont.c
View File

@ -1046,7 +1046,7 @@ ftfont_list (frame, spec)
val = Qnil;
finish:
font_add_log ("ftfont-list", spec, val);
FONT_ADD_LOG ("ftfont-list", spec, val);
if (objset) FcObjectSetDestroy (objset);
if (fontset) FcFontSetDestroy (fontset);
if (pattern) FcPatternDestroy (pattern);
@ -1099,7 +1099,7 @@ ftfont_match (frame, spec)
}
FcPatternDestroy (pattern);
font_add_log ("ftfont-match", spec, entity);
FONT_ADD_LOG ("ftfont-match", spec, entity);
return entity;
}

4
src/w32font.c
View File

@ -201,7 +201,7 @@ w32font_list (frame, font_spec)
Lisp_Object frame, font_spec;
{
Lisp_Object fonts = w32font_list_internal (frame, font_spec, 0);
font_add_log ("w32font-list", font_spec, fonts);
FONT_ADD_LOG ("w32font-list", font_spec, fonts);
return fonts;
}
@ -214,7 +214,7 @@ w32font_match (frame, font_spec)
Lisp_Object frame, font_spec;
{
Lisp_Object entity = w32font_match_internal (frame, font_spec, 0);
font_add_log ("w32font-match", font_spec, entity);
FONT_ADD_LOG ("w32font-match", font_spec, entity);
return entity;
}

4
src/w32uniscribe.c
View File

@ -78,7 +78,7 @@ uniscribe_list (frame, font_spec)
Lisp_Object frame, font_spec;
{
Lisp_Object fonts = w32font_list_internal (frame, font_spec, 1);
font_add_log ("uniscribe-list", font_spec, fonts);
FONT_ADD_LOG ("uniscribe-list", font_spec, fonts);
return fonts;
}
@ -87,7 +87,7 @@ uniscribe_match (frame, font_spec)
Lisp_Object frame, font_spec;
{
Lisp_Object entity = w32font_match_internal (frame, font_spec, 1);
font_add_log ("uniscribe-match", font_spec, entity);
FONT_ADD_LOG ("uniscribe-match", font_spec, entity);
return entity;
}

12
src/xfont.c
View File

@ -476,7 +476,7 @@ xfont_list_pattern (Display *display, char *pattern,
x_uncatch_errors ();
UNBLOCK_INPUT;
font_add_log ("xfont-list", build_string (pattern), list);
FONT_ADD_LOG ("xfont-list", build_string (pattern), list);
return list;
}
@ -615,7 +615,7 @@ xfont_match (frame, spec)
}
UNBLOCK_INPUT;
font_add_log ("xfont-match", spec, entity);
FONT_ADD_LOG ("xfont-match", spec, entity);
return entity;
}
@ -701,7 +701,7 @@ xfont_open (f, entity, pixel_size)
registry = AREF (entity, FONT_REGISTRY_INDEX);
if (font_registry_charsets (registry, &encoding, &repertory) < 0)
{
font_add_log (" x:unknown registry", registry, Qnil);
FONT_ADD_LOG (" x:unknown registry", registry, Qnil);
return Qnil;
}
@ -717,7 +717,7 @@ xfont_open (f, entity, pixel_size)
len = font_unparse_xlfd (entity, pixel_size, name, 512);
if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0)
{
font_add_log (" x:unparse failed", entity, Qnil);
FONT_ADD_LOG (" x:unparse failed", entity, Qnil);
return Qnil;
}
@ -748,7 +748,7 @@ xfont_open (f, entity, pixel_size)
len = font_unparse_xlfd (temp, pixel_size, name, 512);
if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0)
{
font_add_log (" x:unparse failed", temp, Qnil);
FONT_ADD_LOG (" x:unparse failed", temp, Qnil);
return Qnil;
}
xfont = XLoadQueryFont (display, name);
@ -792,7 +792,7 @@ xfont_open (f, entity, pixel_size)
if (! xfont)
{
font_add_log (" x:open failed", build_string (name), Qnil);
FONT_ADD_LOG (" x:open failed", build_string (name), Qnil);
return Qnil;
}