diff options
| author | Richard M. Stallman | 1994-12-23 03:30:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-12-23 03:30:53 +0000 |
| commit | 396e0e6ae592dff16d700540649c8a2a07f5075d (patch) | |
| tree | 0c87c623117a6cd6099e80cca3cbeb09f61e00d8 | |
| parent | 2291bfaae184ccf84399f12954ee8845a5af4db7 (diff) | |
| download | emacs-396e0e6ae592dff16d700540649c8a2a07f5075d.tar.gz emacs-396e0e6ae592dff16d700540649c8a2a07f5075d.zip | |
(server-switch-buffer): Cope with dead frames and windows.
| -rw-r--r-- | lisp/server.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index eab345322f8..0de7dcd7e60 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -342,9 +342,12 @@ starts server process and that is all. Invoked by \\[server-edit]." | |||
| 342 | (defun server-switch-buffer (next-buffer) | 342 | (defun server-switch-buffer (next-buffer) |
| 343 | "Switch to another buffer, preferably one that has a client. | 343 | "Switch to another buffer, preferably one that has a client. |
| 344 | Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it." | 344 | Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it." |
| 345 | (cond ((windowp server-window) | 345 | (cond ((and (windowp server-window) |
| 346 | (window-live-p server-window)) | ||
| 346 | (select-window server-window)) | 347 | (select-window server-window)) |
| 347 | ((framep server-window) | 348 | ((framep server-window) |
| 349 | (if (not (frame-live-p server-window)) | ||
| 350 | (setq server-window (make-frame))) | ||
| 348 | (select-window (frame-selected-window server-window)))) | 351 | (select-window (frame-selected-window server-window)))) |
| 349 | (if (window-minibuffer-p (selected-window)) | 352 | (if (window-minibuffer-p (selected-window)) |
| 350 | (select-window (next-window nil 'nomini 0))) | 353 | (select-window (next-window nil 'nomini 0))) |