adjusting emacs
Merge branch 'master' of github.com:iwfmp/emacs