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

(w32font_open): Adjust it for the change of

Browse source 
font_make_object.
(w32font_open_internal): Don't set properties of font_object here.
This commit is contained in:
Kenichi Handa 2008-07-09 00:32:22 +00:00
parent 0fce2b40e3
commit ec6174cdaf
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/w32font.c
View file

@ -236,7 +236,8 @@ w32font_open (f, font_entity, pixel_size)
{
Lisp_Object font_object;
font_object = font_make_object (VECSIZE (struct w32font_info));
font_object = font_make_object (VECSIZE (struct w32font_info),
font_entity, pixel_size);
if (!w32font_open_internal (f, font_entity, pixel_size, font_object))
{
@ -802,11 +803,6 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
if (!font)
return 0;
/* Copy from font entity. */
for (i = 0; i < FONT_ENTITY_MAX; i++)
ASET (font_object, i, AREF (font_entity, i));
ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
bzero (&logfont, sizeof (logfont));
fill_in_logfont (f, &logfont, font_entity);