Update for emacs 24.4