diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 034569fc30..f1ed3e07e3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-09-28 Romain Francoise <[email protected]> + + * startup.el (command-line): Start the daemon server later. + 2008-09-28 Martin Rudalics <[email protected]> * subr.el (read-quoted-char): Call char-resolve-modifiers diff --git a/lisp/startup.el b/lisp/startup.el index 0833f98d4d..5bd73f9e88 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -881,13 +881,8 @@ opening the first frame (e.g. open a connection to an X server).") (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. + ;; 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 @@ opening the first frame (e.g. open a connection to an X server).") ;; 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) |