Mercurial > emacs
changeset 54431:3e8ea09f9375
(server-process-filter): Delete temp frame.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 19 Mar 2004 00:50:48 +0000 |
| parents | b521d24f538a |
| children | b925e3274547 |
| files | lisp/server.el |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)))