diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-01-21 20:33:17 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-01-21 20:33:17 +0000 |
| commit | 97e121ccb058d3f0b7dc8f397fb2e4dc94264e89 (patch) | |
| tree | 59803f576a994fde81337de377457ea6aa449e6f /lisp/server.el | |
| parent | 3c196b459b6f0b30df28244b68ca3c73586a2ceb (diff) | |
| download | emacs-97e121ccb058d3f0b7dc8f397fb2e4dc94264e89.tar.gz | |
(server-start): Allow server to shut down when no frames are available
in daemon-mode.
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lisp/server.el b/lisp/server.el index 910c0047dce..20b9ff57ffe 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -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) |