Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test. (ediff-cond-compile-for-xemacs-or-emacs): Remove. (top-level, ediff-frame-iconified-p): Simplify if+and to just and. (ediff-read-event, ediff-overlayp, ediff-make-overlay, ediff-delete-overlay): Move the XEmacs test inside the definition.