More emacs changes.