updates for emacs 24.3