GitLab

	(same_size_fonts): Function moved here from xfaces.c.
	(face_name_id_number): Add extern declaration for this.
	* xfaces.c (same_size_fonts): Moved to xfns.c.  Left an extern
	declaration behind.
	(face_name_id_number): Make this externally visible, and make the
	FRAME argument a FRAME_PTR, not a Lisp_Object.
	(compute_char_face): Call face_name_id_number properly.

	* xfaces.c (unload_color): Don't free the pixel for now.

	* xfaces.c (merge_faces): You can't tell if a font is a
	character-cell font or not by testing whether or not it has a
	per_char table.  They all do.