Updated for emacs24.