Updated to Emacs 24