# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1079657448 0
# Node ID 3e8ea09f937548882d4cc28db08f92a5005bb1a2
# Parent  b521d24f538a2bcfb14d2b49683155ac7820ee45
(server-process-filter): Delete temp frame.

diff -r b521d24f538a -r 3e8ea09f9375 lisp/server.el
--- a/lisp/server.el	Fri Mar 19 00:48:51 2004 +0000
+++ b/lisp/server.el	Fri Mar 19 00:50:48 2004 +0000
@@ -305,6 +305,7 @@
 	  client nowait eval
 	  (files nil)
 	  (lineno 1)
+	  (tmp-frame nil) ; Sometimes used to embody the selected display.
 	  (columnno 0))
       ;; Remove this line from STRING.
       (setq string (substring string (match-end 0)))
@@ -319,7 +320,7 @@
 	    (let ((display (server-unquote-arg (match-string 1 request))))
 	      (setq request (substring request (match-end 0)))
 	      (condition-case err
-		  (server-select-display display)
+		  (setq tmp-frame (server-select-display display))
 		(error (process-send-string proc (nth 1 err))
 		       (setq request "")))))
 	   ;; ARG is a line number option.
@@ -366,7 +367,9 @@
 	  (run-hooks 'server-switch-hook)
 	  (unless nowait
 	    (message (substitute-command-keys
-		      "When done with a buffer, type \\[server-edit]")))))))
+		      "When done with a buffer, type \\[server-edit]")))))
+      ;; Avoid preserving the connection after the last real frame is deleted.
+      (if tmp-frame (delete-frame tmp-frame))))
   ;; Save for later any partial line that remains.
   (when (> (length string) 0)
     (process-put proc 'previous-string string)))