Changes to emacs - take #2