1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 03:20:39 -08:00

*** empty log message ***

This commit is contained in:
Kenichi Handa 2006-11-24 01:48:49 +00:00
parent c66661699f
commit 85c3e9081f
2 changed files with 19 additions and 0 deletions

View file

@ -1,3 +1,21 @@
2006-11-24 Kenichi Handa <handa@m17n.org>
* xfont.c (xfont_open): Set font->format.
* xftfont.c (xftfont_open): Set font->format.
* ftfont.c (ftfont_pattern_entity): Add fontformat in a pattern.
(ftfont_list): Include FC_FONTFORMAT in FcObject.
(ftfont_open): Set font->format.
(ftfont_font_format): New function.
* font.h (struct font): New memeber format.
* font.c (Qopentype): New variable.
(syms_of_font): Defsym it.
(Fquery_font): Change the format of the last element of the return
value.
2006-11-22 Kenichi Handa <handa@m17n.org>
* search.c (simple_search): Fix sync with HEAD.

View file

@ -592,6 +592,7 @@ xfont_open (f, entity, pixel_size)
if (! xfont)
return NULL;
font = malloc (sizeof (struct font));
font->format = Qx;
font->font.font = xfont;
font->entity = entity;
font->pixel_size = pixel_size;