updates for emacs24