updated hy-mode, merged emacs