Include coding.h and termhooks.h. (composition_gstring_p): Fix for the terminal case. (composition_gstring_width): Likewise. (fill_gstring_body): Likewise. (autocmp_chars): For terminal, call Fcomposition_get_gstring with the frame. (composition_compute_stop_pos): Adjust cmp_it->stop_pos if point is within a composition. (Fcomposition_get_gstring): Fix the the terminal case.