(Qprepend, Qappend): New variables. (FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted. (FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros. (FONTSET_REF): Optimize if FONTSET is Vdefault_fontset. (FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros. (fontset_ref_and_range, fontset_add, reorder_font_vector) (load_font_get_repertory): New functions. (fontset_set): This function deleted. (fontset_face): New arg FACE. Return face ID, not face. Completely re-written to handle new fontset structure. Caller changed. (free_face_fontset): Use ASET istead of AREF (X) = Y. (face_for_char): Don't call lookup_face. (make_fontset_for_ascii_face): New arg FACE. (fs_load_font): New arg CHARSET_ID. Don't check Vfont_encoding_alist here. (find_font_encoding): New function. (list_fontsets): Use STRINGP, not ! NILP. (accumulate_script_ranges): New function. (Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely re-written to handle new fontset structure. (Ffontset_font): Return a copy of element. (syms_of_fontset): Define symbols Qprepend and Qappend. Fix docstring of font-encoding-alist.