Make emacs follow the new windowing scheme more closely