From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 19 Mar 2004 00:50:48 +0000 (+0000)
Subject: (server-process-filter): Delete temp frame.
X-Git-Tag: ttn-vms-21-2-B4~7213
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b421c815475955e928c2b2471a96569c81ca55e;p=emacs.git

(server-process-filter): Delete temp frame.
---

diff --git a/lisp/server.el b/lisp/server.el
index 3a8bede9f95..fe2fc0f59f4 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -305,6 +305,7 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
 	  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 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
 	    (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 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
 	  (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)))