updates based on emacs-devel.