merged emacs with home version