* xfaces.c (tty_defined_color, merge_face_heights): Now static.