trunk emacs works again.