* 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.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4de35db502f..6379e86b9e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacs.c (daemon_name): New variable.
+        (main): Deal with --daemon=SERVER_NAME.
+        (Fdaemonp): Return a name if one was passed to --daemon.
+
 2008-10-26  Romain Francoise  <romain@orebokech.com>
 
         * emacs.c (daemon_pipe): New variable.