Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test. (ediff-kill-bottom-toolbar): Place (ediff-use-toolbar-p) test inside XEmacs test. (ediff-make-bottom-toolbar): Place whole cond inside XEmacs test, since it was doing nothing on Emacs. (ediff-make-bullet-proof-overlay): Use when rather than if.