# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1232569997 0
# Node ID b837d61f9ebadf96d9b6dffb4c06e0ea5a6abeaa
# Parent  945f3656919f422e0aa1731bd06d000e3b64b106
(server-start): Allow server to shut down when no frames are available
in daemon-mode.

diff -r 945f3656919f -r b837d61f9eba lisp/server.el
--- a/lisp/server.el	Wed Jan 21 20:28:27 2009 +0000
+++ b/lisp/server.el	Wed Jan 21 20:33:17 2009 +0000
@@ -465,10 +465,16 @@
 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 @@
 			     ;; 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)