Update for latest version of emacs 24