changes for emacs 24