# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 769327101 0
# Node ID e473c5ad9e7d1d5c4842d925669859506a5acd35
# Parent  371ae57ac9a81b489cb6392bdcac5efc8e4a119c
(server-done): Never kill buffer here.
(server-buffer-done): Do it here, if temp file.

diff -r 371ae57ac9a8 -r e473c5ad9e7d lisp/server.el
--- a/lisp/server.el	Thu May 19 05:56:21 1994 +0000
+++ b/lisp/server.el	Thu May 19 05:58:21 1994 +0000
@@ -251,7 +251,9 @@
 	  (save-excursion
 	    (set-buffer buffer)
 	    (setq server-buffer-clients nil))
-	  (bury-buffer buffer)))
+	  (if (server-temp-file-p buffer)
+	      (kill-buffer buffer)
+	    (bury-buffer buffer))))
     next-buffer))
 
 (defun server-temp-file-p (buffer)
@@ -269,19 +271,17 @@
 Then bury it, and return a suggested buffer to select next."
   (let ((buffer (current-buffer)))
     (if server-buffer-clients
-	(let (suggested-buffer)
+	(progn
  	  (if (server-temp-file-p buffer)
 	      ;; For a temp file, save, and do make a non-numeric backup
 	      ;; (unless make-backup-files is nil).
 	      (let ((version-control nil)
 		    (buffer-backed-up nil))
-		(save-buffer)
-		(kill-buffer buffer)
-		(setq suggested-buffer (current-buffer)))
+		(save-buffer))
 	    (if (and (buffer-modified-p)
 		     (y-or-n-p (concat "Save file " buffer-file-name "? ")))
 		(save-buffer buffer)))
-	  (or (server-buffer-done buffer) suggested-buffer)))))
+	  (server-buffer-done buffer)))))
 
 ;; If a server buffer is killed, release its client.
 ;; I'm not sure this is really a good idea--do you want the client