Update for emacs-24.4 head builds