diff options
| author | Martin Rudalics | 2012-02-08 15:59:05 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2012-02-08 15:59:05 +0100 |
| commit | 451077ade556c49de63270e3237c72b34aed3474 (patch) | |
| tree | c2238f902908d867fb97472c5a8dc27873595846 /lisp | |
| parent | e41d4836431e257976f891540fb52251800bade1 (diff) | |
| download | emacs-451077ade556c49de63270e3237c72b34aed3474.tar.gz emacs-451077ade556c49de63270e3237c72b34aed3474.zip | |
In server-unselect-display make sure that buffer is live before killing it
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/server.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/server.el b/lisp/server.el index 79858e6d83e..61787db2162 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -403,14 +403,15 @@ If CLIENT is non-nil, add a description of it to the logged message." | |||
| 403 | ;; Rewritten to avoid inadvertently killing the current buffer after | 403 | ;; Rewritten to avoid inadvertently killing the current buffer after |
| 404 | ;; `delete-frame' removed FRAME (Bug#10729). | 404 | ;; `delete-frame' removed FRAME (Bug#10729). |
| 405 | (let ((buffer (frame-parameter frame 'server-dummy-buffer))) | 405 | (let ((buffer (frame-parameter frame 'server-dummy-buffer))) |
| 406 | (if (and (one-window-p 'nomini frame) | 406 | (when (buffer-live-p buffer) |
| 407 | (eq (window-buffer (frame-first-window frame)) buffer)) | 407 | (if (and (one-window-p 'nomini frame) |
| 408 | ;; The temp frame still only shows one buffer, and that is the | 408 | (eq (window-buffer (frame-first-window frame)) buffer)) |
| 409 | ;; internal temp buffer. | 409 | ;; The temp frame still only shows one buffer, and that is the |
| 410 | (delete-frame frame) | 410 | ;; internal temp buffer. |
| 411 | (set-frame-parameter frame 'visibility t) | 411 | (delete-frame frame) |
| 412 | (set-frame-parameter frame 'server-dummy-buffer nil)) | 412 | (set-frame-parameter frame 'visibility t) |
| 413 | (kill-buffer buffer)))) | 413 | (set-frame-parameter frame 'server-dummy-buffer nil)) |
| 414 | (kill-buffer buffer))))) | ||
| 414 | 415 | ||
| 415 | (defun server-handle-delete-frame (frame) | 416 | (defun server-handle-delete-frame (frame) |
| 416 | "Delete the client connection when the emacsclient frame is deleted. | 417 | "Delete the client connection when the emacsclient frame is deleted. |