Update for Emacs-24.4