Commit ffb6157e authored by Martin Rudalics's avatar Martin Rudalics
Browse files

In server-unselect-display don't inadvertently kill current buffer. (Bug#10729)

* server.el (server-unselect-display): Don't inadvertently kill
the current buffer.  (Bug#10729)
parent e74e58c9
2012-02-08 Martin Rudalics <rudalics@gmx.at>
* server.el (server-unselect-display): Don't inadvertently kill
the current buffer. (Bug#10729)
2012-02-08 Glenn Morris <rgm@gnu.org>
* progmodes/sql.el (sql-port, sql-connection-alist, sql-list-all)
......
......@@ -399,16 +399,18 @@ If CLIENT is non-nil, add a description of it to the logged message."
;; visible. If not (which can happen if the user's customizations call
;; pop-to-buffer etc.), delete it to avoid preserving the connection after
;; the last real frame is deleted.
(if (and (eq (frame-first-window frame)
(next-window (frame-first-window frame) 'nomini))
(eq (window-buffer (frame-first-window frame))
(frame-parameter frame 'server-dummy-buffer)))
;; The temp frame still only shows one buffer, and that is the
;; internal temp buffer.
(delete-frame frame)
(set-frame-parameter frame 'visibility t))
(kill-buffer (frame-parameter frame 'server-dummy-buffer))
(set-frame-parameter frame 'server-dummy-buffer nil)))
;; Rewritten to avoid inadvertently killing the current buffer after
;; `delete-frame' removed FRAME (Bug#10729).
(let ((buffer (frame-parameter frame 'server-dummy-buffer)))
(if (and (one-window-p 'nomini frame)
(eq (window-buffer (frame-first-window frame)) buffer))
;; The temp frame still only shows one buffer, and that is the
;; internal temp buffer.
(delete-frame frame)
(set-frame-parameter frame 'visibility t)
(set-frame-parameter frame 'server-dummy-buffer nil))
(kill-buffer buffer))))
(defun server-handle-delete-frame (frame)
"Delete the client connection when the emacsclient frame is deleted.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment