(custom-face-set): Don't copy an empty face, just call custom-face-display-set. (custom-face-reset-saved, custom-face-save, custom-face-reset-factory): Likewise. (custom-face-display-set): Define this here. (custom-display-match-frame): Define here.