Changes to ,emacs