GitLab

(Finternal_merge_in_global_face): Restore old global/local
attribute override order.  Use inline loop instead of calling
default_face_vector.

instead of `!='.

(syms_of_xfaces): Initialize it.
(Finternal_set_lisp_face_attribute): Avoid more consing.

change face on all frames, and change the default for new frames.

instead of store_frame_param.

(Finternal_merge_in_global_face): Use it instead of merge_face_vectors.

  Clear TO's :font attribute if made inconsistent by a font-related attribute in FROM.
(merge_face_inheritance):
  Add function comment.

(Finternal_set_lisp_face_attribute): Fix typo in error message.

  New variable.
(syms_of_xfaces):
  Initialize it.
(LFACE_INHERIT):
  New macro.
(Finternal_get_lisp_face_attribute, merge_face_vector_with_property)
(Finternal_set_lisp_face_attribute):
  Deal with :inherit attribute.
(check_lface_attrs):
  Allow new types of face height.  Check inherit attribute.
(CYCLE_CHECK):
  New macro.
(merge_face_inheritance):
  New function.
(merge_face_vectors):
  Merge inherited faces too.  Add F and CYCLE_CHECK arguments.
(merge_face_vector_with_property, Finternal_merge_in_global_face)
(lookup_named_face, lookup_derived_face, realize_named_face)
(face_at_string_position, face_at_buffer_position):
  Supply new F and CYCLE_CHECK arguments to merge_face_vectors.
(merge_face_heights):
  New function.
(merge_face_vectors, merge_face_vector_with_property)
(Finternal_set_lisp_face_attribute):
  Call merge_face_heights to handle relative face heights.
(lface_same_font_attributes_p):
  Compare heights using EQ.

(Qtty_color_alist, Vtty_defined_color_alist): New variables.
(realize_tty_face): Use them.
(syms_of_xfaces): Initialize new variables.
(map_tty_color): New function, extracted from realize_tty_face.
(map_tty_color) [MSDOS || WINDOWSNT]: If using the frame's default
foreground or background color, store the new color name in the
realized face; previous code trying to do this had no effect.
(realize_tty_face): Use map_tty_color.
(Fclear_face_cache): Set face_change_count and ensure thorough
redisplay.

DEFVAR_LISP; staticpro instead.

default'face's fontset, not using the default fontset.

about ENCODING.

only if HAVE_X_WINDOWS.

(syms_of_xfaces): Defsubr Sdump_colors.
(x_free_colors): Don't treat b&w specially on default visual.
(x_free_dpy_colors): New function.
(free_face_colors): Don't check visual class; it's done
in x_free_colors.

result face, set flags in the face indicating that colors may not
be freed.

(free_realized_multibyte_face): Ditto.

xassert.  BASE_FACE may not be a face for ASCII.

variable.
(realize_tty_face): Suppress boldness if colors are the inverse of
the default colors, and tty_suppress_bold_inverse_default_colors_p
is set.
(Ftty_suppress_bold_inverse_default_colors): New function.
(syms_of_xfaces): Defsubr it.

* xdisp.c (compute_string_pos): Fix order of arguments to
string_pos_nchars_ahead.
(handle_fontified_prop, add_to_log): Pass int, not Lisp_Object, as
count arg to variable-arg routines like Frun_hook_with_args and Fformat.
(back_to_previous_visible_line_start, build_desired_tool_bar_string):
Pass Lisp_Object, not int, to fixed-arg routines like
Fget_char_property and Fmake_string.
(reconsider_clip_changes): Use XINT when comparing integer lisp
objects, or passing them as int arguments.
(mark_window_display_accurate, insert_left_trunc_glyphs, append_space,
extend_face_to_end_of_line): Use make_number when storing or passing
integer values as lisp objects.
(set_cursor_from_row, highlight_trailing_whitespace): Use INTEGERP,
not implicit test against zero, for glyph object.
(try_window_id): Don't use make_number when we want an int value.

* xfaces.c (xlfd_symbolic_value): Make last argument a Lisp_Object, to
be consistent with callers.
(Fbitmap_spec_p): Use XINT to get numeric value of height.
(lface_hash): Apply XFASTINT to lisp values before folding in.

* xfns.c (Fx_show_tip): Use make_number to get lisp objects to fill in window
width and height.  Pass an int, not a lisp object, as first arg to Finsert.

the faces.

of Fsymbol_value.
(xstrdup): Moved to alloc.c.

[DEBUG_X_COLORS]: New functions.
(x_free_colors) [DEBUG_X_COLORS]: Unregister colors.

as strings only if both are known to be strings.

(lface_fully_specified_p): Don't check contents of
LFACE_FONT_INDEX because that attribute is optional.
(realize_x_face): Remove now unwarranted xassert.

Variables removed.
(clear_font_table, frame_update_line_height, load_face_font):
Adjusted for the change of fontset implementation.
(load_face_fontset_font): Function removed.
(pixel_point_size): New function.
(font_list): Argument type changed.  Caller changed.
(LFACE_FONT): New macro.
(check_lface_attrs): Check attr[LFACE_FONT_INDEX].
(set_lface_from_font_name): Type of arg FONTNAME is changed to
Lisp_Object.  Determine the font name by actually loading a font
by the specified pattern.  Set LFACE_FONT (lface) to the specified
pattern.  Even if a font is not found, don't try alternatives.
(Finternal_set_lisp_face_attribute): Handle `font' slot in lface.
(set_font_frame_param): If `font' is specified in lface, use it.
(Finternal_get_lisp_face_attribute): Handle `font' slot in lface.
(lface_same_font_attributes_p): Likewise.
(make_realized_face): Arguent changed.  Caller changed.  Set
face->ascii_face to face itself.
(free_realized_face): Free face->fontset if face is for ASCII.
(face_suitable_for_iso8859_1_p, face_suitable_for_charset_p,
deduce_unibyte_registry, x_charset_registry): Functions removed.
(free_realized_multibyte_face): New function.
(lookup_face, lookup_named_face, lookup_derived_face): Argument
changed.  Caller changed.
(try_font_list): Argument type changed.
(face_fontset): Check `font' slot of ATTRS, not `family' slot.
(choose_face_font): Argument changed.  Handle fontset properly.
(choose_face_fontset_font): Function removed.
(realize_default_face, realize_named_face): Don't remove the
former face here.
(realize_face): Argument changed.  Caller changed.  Remove face
with the arg former_face_id in advance.  Load font for the new
face.
(realize_x_face): Argument changed.  Caller changed.  For a
multibyte character, share fontset with base_face.  For a single
byte character, make a new realized fontset.  Don't load a font
here.
(realize_tty_face): Argument changed.  Caller changed.
(compute_char_face): Call FACE_FOR_CHAR, not FACE_FOR_CHARSET.
(face_at_buffer_position): Don't check multibyte_p for returning
DEFAULT_FACE_ID.
(face_at_string_position): Call FACE_SUITABLE_FOR_CHAR_P, not
FACE_SUITABLE_FOR_CHARSET_P.
(syms_of_xfaces): Remove code for Qx_charset_registry and
Vface_default_registry.

FRAME_X_COLORMAP.  Be paranoid about freeing black and white
when default colormap is used.

non-platform-specific equivalents.
[WINDOWSNT]: include w32term.h, fontset.h and define X specific
functions and macros as their w32 equivalents where
non-platform-specifics are not available.
[HAVE_X_WINDOWS]: Change most of these to HAVE_WINDOW_SYSTEM.
(x_create_gc, x_free_gc) [WINDOWSNT]: Add W32 versions.
(clear_font_table) [WINDOWSNT]: Call w32_unload_font.
(frame_update_line_height): Use macros to access f->output_data.
(defined_color): Remove FIXME comments; fixed.
(x_face_list_fonts, prepare_face_for_display): Put X specifics into
#ifdef blocks. Add WINDOWSNT blocks.
(Fx_list_fonts): Use macros for accessing font data.
(set_lface_from_font_name): Different default fonts for X and WINDOWSNT.
(font_scalable_p) [WINDOWSNT]: Treat wildcard XLFD_AVGWIDTH as
scalable for backward compatibility.
(realize_tty_face) [MSDOS]: do the same for WINDOWSNT.
(syms_of_xfaces) [WINDOWSNT]: Allow scalable fonts by default.

(unload_color, free_face_colors): Use it.