kill-this-buffer instead of kill-buffer.