mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 08:11:05 -08:00
Code Issues Projects Releases Wiki Activity

(xfont_open): Log the reason of failure.

Browse source
This commit is contained in:
Kenichi Handa 2008-07-10 01:27:07 +00:00
parent e0079d39e5
commit c8e0e16d2d
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2008-07-10 Kenichi Handa <handa@m17n.org>
* xfont.c (xfont_open): Log the reason of failure.
2008-07-09 Stefan Monnier <monnier@iro.umontreal.ca>
* fontset.c (fontset_get_font_group):

15
src/xfont.c
View file

@ -509,7 +509,10 @@ xfont_open (f, entity, pixel_size)
font. */
registry = AREF (entity, FONT_REGISTRY_INDEX);
if (font_registry_charsets (registry, &encoding, &repertory) < 0)
return Qnil;
{
font_add_log (" x:unknown registry", registry, Qnil);
return Qnil;
}
if (XINT (AREF (entity, FONT_SIZE_INDEX)) != 0)
pixel_size = XINT (AREF (entity, FONT_SIZE_INDEX));
@ -522,7 +525,10 @@ xfont_open (f, entity, pixel_size)
}
len = font_unparse_xlfd (entity, pixel_size, name, 256);
if (len <= 0)
return Qnil;
{
font_add_log (" x:unparse failed", entity, Qnil);
return Qnil;
}
BLOCK_INPUT;
x_catch_errors (display);
@ -562,7 +568,10 @@ xfont_open (f, entity, pixel_size)
UNBLOCK_INPUT;
if (! xfont)
return Qnil;
{
font_add_log (" x:open failed", build_string (name), Qnil);
return Qnil;
}
font_object = font_make_object (VECSIZE (struct xfont_info),
entity, pixel_size);