diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-10-26 19:05:47 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-10-26 19:05:47 +0000 |
| commit | 5790ef40bae85dc23ae404098198879106057697 (patch) | |
| tree | b479642da69b4f0531ed8efefc739e31cbcaa8e1 /lisp/startup.el | |
| parent | 91c491e0518186d86e66413736025f2f585daf60 (diff) | |
| download | emacs-5790ef40bae85dc23ae404098198879106057697.tar.gz | |
* startup.el (command-line): Call daemon-initialized after
starting the server.
* emacs.c (daemon_pipe): New variable
(main): Create a pipe before forking, make the parent exit only after
the child has closed its end of the pipe. Move closing the
descriptors ...
(Fdaemon_initialized): ... here. New function.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 1c39c8c95f5..7b7fbb2fd68 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1213,7 +1213,8 @@ the `--debug-init' option to view a complete error backtrace." ;; processing all command line arguments to allow e.g. `server-name' ;; to be changed before the server starts. (when (daemonp) - (server-start)) + (server-start) + (daemon-initialized)) ;; Run emacs-session-restore (session management) if started by ;; the session manager and we have a session manager connection. |