diff options
| author | Glenn Morris <rgm@gnu.org> | 2016-11-15 23:28:47 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2016-11-15 23:28:47 -0800 |
| commit | 36b99556dea23f17d5598bbed366e7201eec9fbb (patch) | |
| tree | b464455587a53e706288f95da497721c5c42a2c9 /doc/emacs/glossary.texi | |
| parent | 35007ad9daca9cac39fe758b5815aa6389379d38 (diff) | |
| download | emacs-36b99556dea23f17d5598bbed366e7201eec9fbb.tar.gz emacs-36b99556dea23f17d5598bbed366e7201eec9fbb.tar.bz2 emacs-36b99556dea23f17d5598bbed366e7201eec9fbb.zip | |
Add --new-daemon, which runs in the foreground and does not fork
This is intended for modern init systems such as systemd,
which manage many of the traditional aspects of daemon behavior
themselves. (Bug#2677)
* src/emacs.c (daemon_type): New integer.
(usage, standard_args): Add --old-daemon and --new-daemon.
(main): Handle --old-daemon and --new-daemon arguments.
Restrict all the forking and complicated daemon stuff to old-daemon.
(Fdaemon_initialized): Handle new-style daemon.
* src/lisp.h (IS_DAEMON, DAEMON_RUNNING) [!WINDOWNT]:
Replace daemon_pipe with daemon_type.
* doc/emacs/cmdargs.texi (Initial Options):
* doc/emacs/glossary.texi (Glossary):
* doc/emacs/misc.texi (Emacs Server):
* doc/lispref/display.texi (Window Systems):
* doc/lispref/os.texi (Startup Summary): Related doc updates.
* etc/NEWS: Mention this.
* etc/emacs.service: Use Type=simple and --new-daemon.
Diffstat (limited to 'doc/emacs/glossary.texi')
| -rw-r--r-- | doc/emacs/glossary.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index bce97dacee2..d6489390ea5 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi @@ -338,8 +338,8 @@ or by rebinding key sequences (@pxref{Keymaps}). @item Daemon A daemon is a standard term for a system-level process that runs in the background. Daemons are often started when the system first starts up. -When Emacs runs in daemon-mode, it runs in the background and does not -open a display. You can then connect to it with the +When Emacs runs in daemon-mode, it does not +open a display. You connect to it with the @command{emacsclient} program. @xref{Emacs Server}. @item Default Argument |