(Vcomposition_function_table, Qcomposition_function_table): Delete variables. (Qauto_composed, Vauto_composition_function, Qauto_composition_function): New variables. (run_composition_function): Don't call compose-chars-after-function. (update_compositions): Clear `auto-composed' text property. (compose_chars_in_text): Delete this function. (syms_of_composite): Staticpro Qauto_composed and Qauto_composition_function. Declare Vauto_composition_function as a Lisp variable.