(server-done): Fix harmlessly wrong arg to save-buffer. (server-switch-buffer): Only select a different window if next-buffer is non-nil. Don't switch in a dedicated window. If next-buffer is already displayed, reuse that window.