Updated for emacs 25.