emacs ediff setup improvements