Add XPM support back into compiled Emacs.
Swap some spaces for tabs.