emacs related changes