emacs: trunk 6607a79 obsoletes this