Support Emacs 25 (24.4)