(USAGE1): Add --daemon.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3c51f770eba080a532e384f19ca89df374d3cbd1..05447ddb88420ca739725ba40c901637bd902402 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-03  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.c (USAGE1): Add --daemon.
+
 2008-10-02  Eli Zaretskii  <eliz@gnu.org>
 
        * process.c (procfs_system_process_attributes): Multiply `pcpu' by

diff --git a/src/emacs.c b/src/emacs.c
index f94d2d39ae4cfaca93ecb1e1868475116085c437..2fb975c0fc1896862d411dc7879a7523ca050219 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -257,6 +257,7 @@ read the main documentation for these command-line arguments.\n\
 Initialization options:\n\
 \n\
 --batch                     do not do interactive display; implies -q\n\
+--daemon                    start a server in the background\n\
 --debug-init                enable Emacs Lisp debugger for init file\n\
 --display, -d DISPLAY       use X server DISPLAY\n\
 --multibyte, --no-unibyte   inhibit the effect of EMACS_UNIBYTE\n\