procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(server-start): Allow server to shut down when no frames are available

Browse source 
in daemon-mode.
This commit is contained in:
Chong Yidong 2009-01-21 20:33:17 +00:00
parent 3c196b459b
commit 97e121ccb0
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/server.el
View file

@ -465,10 +465,16 @@ If a server is already running, the server is not started.
To force-start a server, do \\[server-force-delete] and then
\\[server-start]."
(interactive "P")
(when (or
(not server-clients)
(yes-or-no-p
"The current server still has clients; delete them? "))
(when (or (not server-clients)
;; Ask the user before deleting existing clients---except
;; when we can't get user input, which may happen when
;; doing emacsclient --eval "(kill-emacs)" in daemon mode.
(if (and (daemonp)
(null (cdr (frame-list)))
(eq (selected-frame) terminal-frame))
leave-dead
(yes-or-no-p
"The current server still has clients; delete them? ")))
(let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
(server-file (expand-file-name server-name server-dir)))
(when server-process
@ -979,7 +985,7 @@ The following commands are accepted by the client:
;; We can't use the Emacs daemon's
;; terminal frame.
(not (and (daemonp)
(= (length (frame-list)) 1)
(null (cdr (frame-list)))
(eq (selected-frame)
terminal-frame)))))
(setq tty-name nil tty-type nil)