(server-switch-buffer): Cope with dead frames and windows.

diff --git a/lisp/server.el b/lisp/server.el
index eab345322f8da3f2afa1d77cf9c727a2cca14f85..0de7dcd7e608e6d43bea1651d9a94ebae9e15f3b 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -342,9 +342,12 @@ starts server process and that is all.  Invoked by \\[server-edit]."
 (defun server-switch-buffer (next-buffer)
   "Switch to another buffer, preferably one that has a client.
 Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
-  (cond ((windowp server-window)
+  (cond ((and (windowp server-window)
+             (window-live-p server-window))
         (select-window server-window))
        ((framep server-window)
+        (if (not (frame-live-p server-window))
+            (setq server-window (make-frame)))
         (select-window (frame-selected-window server-window))))
   (if (window-minibuffer-p (selected-window))
       (select-window (next-window nil 'nomini 0)))