Changes to emacs - take #6
Changes to emacs - take #7