* emacs.c (daemon_name): New variable.

(main): Deal with --daemon=SERVER_NAME.
(Fdaemonp): Return a name if one was passed to --daemon.

* startup.el (server-name): Pacify byte compiler.
(command-line): If --daemon=SERVER_NAME was used, set server-name
before calling server-start.

* cmdargs.texi (Initial Options): Document -daemon=SERVER_NAME.

2 files changed, 8 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7f1cf1b78e0..fbbe7ec0ed3 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * cmdargs.texi (Initial Options): Document -daemon=SERVER_NAME.
+
 2008-10-23  Chong Yidong  <cyd@stupidchicken.com>
 
         * custom.texi (Function Keys): Note that modified keypad keys are not
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 94e69bcdfe8..6be6a983461 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -286,6 +286,10 @@ terminal), do not open any frames and start the server.  Clients can
 connect and create graphical or terminal frames using
 @code{emacsclient}.
 
+@item -daemon=@var{SERVER-NAME}
+Start emacs in background as a daemon, and start the server with the
+name set to @var{SERVER-NAME}.
+
 @item --no-splash
 @opindex --no-splash
 @vindex inhibit-startup-screen