set EDITOR to emacs
merged changes