(w32_show_hourglass): Rename from show_hourglass.
(w32_hide_hourglass): Rename from hide_hourglass.
(DEFAULT_HOURGLASS_DELAY): Revert from last change.
(Vhourglass_delay): Declare extern.
(hourglass_started): Remove.
* xdisp.c (Vhourglass_delay): Remove static.
(hourglass_started, start_hourglass, cancel_hourglass):
Don't include these versions on WINDOWSNT.
always defined as int.
* s/netbsd.h (HAVE_UNION_WAIT, HAVE_WAIT_HEADER, WAIT_USE_INT):
* s/gnu.h (HAVE_WAIT_HEADER, WAIT_USE_INT, HAVE_UNION_WAIT):
* s/gnu-linux.h (HAVE_WAIT_HEADER):
* s/freebsd.h (HAVE_WAIT_HEADER):
* s/bsd-common.h (HAVE_UNION_WAIT):
* s/aix4-2.h (HAVE_WAIT_HEADER):
* m/mips.h (HAVE_UNION_WAIT):
* s/usg5-4.h (HAVE_WAIT_HEADER, WAITTYPE): Do not define, not used.
(COFF, static): Do not define, they are undefined later in the file.
* process.c (update_status): Don't use a union.
(status_convert):
(sigchld_handler): Use int instead of WAITTYPE.
* movemail.c (main): Use int instead of WAITTYPE.
member order compatible with struct ftfont_info.
(xftfont_open): Add FC_CHARSET to the pattern. Set
xftfont_info->ft_size. Don't unlock the face. Check BDF
properties if appropriate.
(xftfont_close): Unlock the face.
(xftfont_anchor_point, xftfont_shape): Deleted.
(syms_of_xftfont): Don't set members anchor_point and shape of
xftfont_driver.
fc_charset_idx. Make the member order compatible with struct
xftfont_info.
(fc_charset_table): Change charset names to registry names.
(ftfont_pattern_entity): Delete the args registry and
fc_charset_idx. Change the value of :font-entity property
to (FONTNAME . INDEX). Always set :registry property to
`iso10646-1'.
(struct ftfont_cache_data): New struct.
(ftfont_lookup_cache): New arg for_face.
(ftfont_get_fc_charset, ftfont_get_otf): New functions.
(ftfont_driver): Set the member otf_capability.
(ftfont_get_charset): Adjust it for the change of
fc_charset_table.
(OTF_TAG_SYM): New macro.
(ftfont_spec_pattern): Delete the arg fc_charset_idx. Adjust it
for the change of fc_charset_table.
(ftfont_list): Adjust it for the change of ftfont_spec_pattern and
ftfont_pattern_entity. Add FC_INDEX to objset.
(ftfont_match): Adjust it for the change of ftfont_spec_pattern
and ftfont_pattern_entity.
(ftfont_open): Adjust it for the change of ftfont_lookup_cache,
font_make_object, struct ftfont_info.
(ftfont_has_char): Use ftfont_get_fc_charset.
(ftfont_otf_features, ftfont_otf_capability): New functions.
(ftfont_shape): Use ftfont_get_otf.
(font_check_otf_features, font_check_otf): New functions.
(font_match_p): Check :lang, :script, and :otf properties.
(font_open_entity): Set the member vertical_centering of struct
font.
(reorder_font_vector): Change the arg preferred_family to font.
Prefer the spec matching with font.
(fontset_get_font_group): New function.
(fontset_find_font): Change the format of an element of a realized
fontset. Use fontset_get_font_group.
(fontset_font): Try the current fontset, the default fontset, the
fallbacks of the current fonset, and the fallbacks of the default
fontset in this order.
(face_for_char): Delete the shortcut to use the current font.
(fontset_from_font): Don't set fonts for Latin in the fontset.