diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-05-15 09:09:48 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-05-15 09:09:48 -0700 |
| commit | 3ee1841f288b5b9cf9301945d10db2b45688bcf8 (patch) | |
| tree | a1168744379c82fa3c0a92e14373fcc3897fb435 /doc/man | |
| parent | b3956d85c71c30af732a8bc035ed39421bafe11d (diff) | |
| parent | b98cf9cdabd710f89eb57645a163fd52db338404 (diff) | |
| download | emacs-3ee1841f288b5b9cf9301945d10db2b45688bcf8.tar.gz | |
Merge from origin/emacs-26
b98cf9c ; Fix a typo in the Emacs manual
700fcd7 * doc/emacs/help.texi: Fix paren typo.
c9c0e40 More minor changes in shell-related nodes of Emacs manual
e6bf19c Fix inaccuracies in "Shell Ring" node of Emacs manual
087681b8 Improve documentation of kmacro commands and variables.
be2e8cb * doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
1d9e66a Don't check non-X frames for z order (Bug#31373)
7dc028e Check NSWindow is actually a frame
Conflicts:
src/nsfns.m
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/emacs.1.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in index 51169530419..e332fb45c7b 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in @@ -123,7 +123,7 @@ Use specified as the terminal instead of using stdin/stdout. This must be the first argument specified in the command line. .TP -.BI \-\-daemon "\fR[=\fPname\fR]" +.BI \-\-daemon "\fR[=\fPname\fR], " \-\-bg\-daemon "\fR[=\fPname\fR]" Start Emacs as a daemon, enabling the Emacs server and disconnecting from the terminal. You can then use the emacsclient (see .BR emacsclient (1)) @@ -131,6 +131,9 @@ command to connect to the server (with optional .IR name ")." .TP +.BI \-\-fg\-daemon "\fR[=\fPname\fR]" +Like "\-\-bg\-daemon", but don't disconnect from the terminal. +.TP .B \-\-version Display .I Emacs |