merge with mac .emacs