Update of some emacs formatting code, respect 80-column layout
(just makes things easier to read, I think)