Add kill-buffer-and-window.