Make compilation work again for Emacs 22