More work to get emacs the way I like it.