[Emacs-diffs] Changes to emacs/lisp/server.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/09/24 20:12:02

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- server.el   6 Sep 2008 17:17:05 -0000       1.167
+++ server.el   24 Sep 2008 20:12:02 -0000      1.168
@@ -1084,7 +1084,13 @@
          ;; 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