Commit a378aa9d authored by Dmitry Antipov's avatar Dmitry Antipov

* font.c (font_list_entities): Remove dummy assignment.

* font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are
used on graphic displays only.  Remove unused 'font_encoder' member.
* nsfont.m (nsfont_open):
* w32font.c (w32font_open_internal): Adjust users.
parent 8497f938
2013-12-04 Dmitry Antipov <dmantipov@yandex.ru>
* font.c (font_list_entities): Remove dummy assignment.
* font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are
used on graphic displays only. Remove unused 'font_encoder' member.
* nsfont.m (nsfont_open):
* w32font.c (w32font_open_internal): Adjust users.
2013-12-03 Paul Eggert <eggert@cs.ucla.edu>
Use bool for boolean.
......
......@@ -2718,7 +2718,7 @@ font_list_entities (struct frame *f, Lisp_Object spec)
ASET (scratch_font_spec, FONT_SPACING_INDEX, AREF (spec, FONT_SPACING_INDEX));
ASET (scratch_font_spec, FONT_EXTRA_INDEX, AREF (spec, FONT_EXTRA_INDEX));
for (i = 0; driver_list; driver_list = driver_list->next)
for (; driver_list; driver_list = driver_list->next)
if (driver_list->on
&& (NILP (ftype) || EQ (driver_list->driver->type, ftype)))
{
......
......@@ -312,6 +312,10 @@ struct font
/* Ascent and descent of the font (in pixels). */
int ascent, descent;
/* The following members makes sense on graphic displays only. */
#if defined (HAVE_WINDOW_SYSTEM)
/* Vertical pixel width of the underline. If is zero if that
information is not in the font. */
int underline_thickness;
......@@ -374,12 +378,6 @@ struct font
registered in char-table `use-default-ascent'. */
int default_ascent;
/* CCL program to calculate code points of the font. */
struct ccl_program *font_encoder;
/* Font-driver for the font. */
struct font_driver *driver;
/* Charset to encode a character code into a glyph code of the font.
-1 means that the font doesn't require this information to encode
a character. */
......@@ -390,6 +388,11 @@ struct font
determine it. */
int repertory_charset;
#endif /* HAVE_WINDOW_SYSTEM */
/* Font-driver for the font. */
struct font_driver *driver;
/* There are more members in this structure, but they are private
to the font-driver. */
};
......
......@@ -829,7 +829,6 @@ when setting family in ns_spec_to_descriptor(). */
font->vertical_centering = 0;
font->baseline_offset = 0;
font->relative_compose = 0;
font->font_encoder = NULL;
font->props[FONT_FORMAT_INDEX] = Qns;
font->props[FONT_FILE_INDEX] = Qnil;
......
......@@ -1012,7 +1012,6 @@ w32font_open_internal (struct frame *f, Lisp_Object font_entity,
font->baseline_offset = 0;
font->relative_compose = 0;
font->default_ascent = w32_font->metrics.tmAscent;
font->font_encoder = NULL;
font->pixel_size = size;
font->driver = &w32font_driver;
/* Use format cached during list, as the information we have access to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment