updated emacs file for org mode
after merge