More emacs hacking