Skip to content

Commit 04340a8

Browse files
committed
Improve documentation of the daemon and emacsclient
* doc/emacs/misc.texi (emacsclient Options): * doc/emacs/cmdargs.texi (Initial Options): Document that using --daemon=NAME will need to specify the same NAME when invoking 'emacscilent'. (Bug#35547)
1 parent 3e29de2 commit 04340a8

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

doc/emacs/cmdargs.texi

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -347,13 +347,15 @@ Start Emacs with minimum customizations. This is similar to using
347347
@itemx --bg-daemon[=@var{name}]
348348
@itemx --fg-daemon[=@var{name}]
349349
Start Emacs as a daemon: after Emacs starts up, it starts the Emacs
350-
server without opening any frames.
351-
(Optionally, you can specify an explicit @var{name} for the server.)
352-
You can then use the @command{emacsclient} command to connect to Emacs
353-
for editing. @xref{Emacs Server}, for information about using Emacs
354-
as a daemon. A ``background'' daemon disconnects from the terminal
355-
and runs in the background (@samp{--daemon} is an alias for
356-
@samp{--bg-daemon}).
350+
server without opening any frames. You can then use the
351+
@command{emacsclient} command to connect to Emacs for editing.
352+
(Optionally, you can specify an explicit @var{name} for the server; if
353+
you do, you will need to specify the same @var{name} when you invoke
354+
@command{emacsclient}, via its @option{--socket-name} option, see
355+
@ref{emacsclient Options}.) @xref{Emacs Server}, for information
356+
about using Emacs as a daemon. A ``background'' daemon disconnects
357+
from the terminal and runs in the background (@samp{--daemon} is an
358+
alias for @samp{--bg-daemon}).
357359

358360
@item --no-desktop
359361
@opindex --no-desktop

doc/emacs/misc.texi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,6 +1925,9 @@ omitted, @command{emacsclient} connects to the first server it finds.
19251925
If you set @code{server-name} of the Emacs server to an absolute file
19261926
name, give the same absolute file name as @var{server-name} to this
19271927
option to instruct @command{emacsclient} to connect to that server.
1928+
You need to use this option if you started Emacs as daemon
1929+
(@pxref{Initial Options}) and specified the name for the server
1930+
started by the daemon.
19281931

19291932
@item -t
19301933
@itemx --tty

0 commit comments

Comments
 (0)