From 453e452200f9c39e7f4fa6ba084efbf6014ba210 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 6 Oct 2011 11:13:45 -0400 Subject: [PATCH] Document exactly how emacsclient's -a "" starts the daemon. * doc/emacs/misc.texi (emacsclient Options): Document how emacsclient runs the Emacs daemon. * doc/man/emacsclient.1: Document how -a "" starts the daemon. Fixes: debbugs:9674 --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/misc.texi | 4 ++-- doc/man/ChangeLog | 4 ++++ doc/man/emacsclient.1 | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7d883a6eb91..ea124fb4402 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2011-10-06 Chong Yidong + + * misc.texi (emacsclient Options): Document how emacsclient runs + the Emacs daemon (Bug#9674). + 2011-10-01 Chong Yidong * basic.texi (Moving Point): diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 598f495784f..d7639b3b665 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1531,8 +1531,8 @@ Specify a command to run if @code{emacsclient} fails to contact Emacs. This is useful when running @code{emacsclient} in a script. As a special exception, if @var{command} is the empty string, then -@code{emacsclient} starts Emacs in daemon mode and then tries -connecting again. +@code{emacsclient} starts Emacs in daemon mode (as @command{emacs +--daemon}) and then tries connecting again. @cindex @env{ALTERNATE_EDITOR} environment variable The environment variable @env{ALTERNATE_EDITOR} has the same effect as diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index a5146be9175..b9175ce51ea 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2011-10-06 Chong Yidong + + * emacsclient.1: Document how -a "" starts the daemon. + 2011-09-17 Sven Joachim * emacs.1: Escape a dash. diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1 index 4020b6c0b6a..a5abcff0d5d 100644 --- a/doc/man/emacsclient.1 +++ b/doc/man/emacsclient.1 @@ -52,8 +52,8 @@ options starting with two dashes (`-'). .B \-a, \-\-alternate-editor=EDITOR if the Emacs server is not running, run the specified editor instead. This can also be specified via the `ALTERNATE_EDITOR' environment variable. -If the value of EDITOR is the empty string, then Emacs is started in -daemon mode and emacsclient will try to connect to it. +If the value of EDITOR is the empty string, run `emacs --daemon' to +start Emacs in daemon mode, and try to connect to it. .TP .B -c, \-\-create-frame create a new frame instead of trying to use the current Emacs frame -- 2.39.2