Changes to emacs - take #3
Changes to emacs - take #4