updates for emacs 24.4