[Emacs-diffs] Changes to emacs/lisp/startup.el,v

[Romain Francoise]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Romain Francoise <rfrancoise>   08/09/28 09:37:11

Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -b -r1.506 -r1.507
--- startup.el  26 Sep 2008 17:42:22 -0000      1.506
+++ startup.el  28 Sep 2008 09:37:11 -0000      1.507
@@ -881,13 +881,8 @@
 
   (run-hooks 'before-init-hook)
 
-  (if (daemonp)
-      ;; Just start the server here, no need to run
-      ;; `frame-initialize', it deals with creating a frame and
-      ;; setting the parameters for the initial frame, we don't need
-      ;; any oxof those.
-      (server-start)
     ;; Under X Window, this creates the X frame and deletes the terminal frame.
+  (unless (daemonp)
     (frame-initialize))
 
   ;; Turn off blinking cursor if so specified in X resources.  This is here
@@ -1224,6 +1219,13 @@
   ;; If -batch, terminate after processing the command options.
   (if noninteractive (kill-emacs t))
 
+  ;; In daemon mode, start the server to allow clients to connect.
+  ;; This is done after loading the user's init file and after
+  ;; processing all command line arguments to allow e.g. `server-name'
+  ;; to be changed before the server starts.
+  (when (daemonp)
+    (server-start))
+
   ;; Run emacs-session-restore (session management) if started by
   ;; the session manager and we have a session manager connection.
   (if (and (boundp 'x-session-previous-id)