mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

(server-buffer-done): Avoid changing the buffer when deleting the

Browse Source 
client's frame (bug#640).
This commit is contained in:
Chong Yidong 2008-09-24 20:12:02 +00:00
parent ef1a3179f0
commit 737e5c834b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/server.el
View File

@ -1084,7 +1084,13 @@ FOR-KILLING if non-nil indicates that we are called from `kill-buffer'."
;; tell it that it is done, and forget it entirely.
(unless buffers
(server-log "Close" proc)
(server-delete-client proc)))))
(if for-killing
;; `server-delete-client' might delete the client's
;; frames, which might change the current buffer. We
;; don't want that (bug#640).
(save-current-buffer
(server-delete-client proc))
(server-delete-client proc))))))
(when (and (bufferp buffer) (buffer-name buffer))
;; We may or may not kill this buffer;
;; if we do, do not call server-buffer-done recursively