changes for emacs 24.3