more emacs changes.