update emacs-notes
merge with origin