updated for emacs 24.3