diff options
| author | Chong Yidong | 2011-10-06 11:13:45 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-10-06 11:13:45 -0400 |
| commit | 453e452200f9c39e7f4fa6ba084efbf6014ba210 (patch) | |
| tree | fe5c82d71249810ce937ca617718d8cf6c08dfdd | |
| parent | a1c2d21e0e23bb792ecf973355480db6f14e4464 (diff) | |
| download | emacs-453e452200f9c39e7f4fa6ba084efbf6014ba210.tar.gz emacs-453e452200f9c39e7f4fa6ba084efbf6014ba210.zip | |
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
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/misc.texi | 4 | ||||
| -rw-r--r-- | doc/man/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2011-10-06 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * misc.texi (emacsclient Options): Document how emacsclient runs | ||
| 4 | the Emacs daemon (Bug#9674). | ||
| 5 | |||
| 1 | 2011-10-01 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-10-01 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * basic.texi (Moving Point): | 8 | * 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. | |||
| 1531 | This is useful when running @code{emacsclient} in a script. | 1531 | This is useful when running @code{emacsclient} in a script. |
| 1532 | 1532 | ||
| 1533 | As a special exception, if @var{command} is the empty string, then | 1533 | As a special exception, if @var{command} is the empty string, then |
| 1534 | @code{emacsclient} starts Emacs in daemon mode and then tries | 1534 | @code{emacsclient} starts Emacs in daemon mode (as @command{emacs |
| 1535 | connecting again. | 1535 | --daemon}) and then tries connecting again. |
| 1536 | 1536 | ||
| 1537 | @cindex @env{ALTERNATE_EDITOR} environment variable | 1537 | @cindex @env{ALTERNATE_EDITOR} environment variable |
| 1538 | The environment variable @env{ALTERNATE_EDITOR} has the same effect as | 1538 | 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 @@ | |||
| 1 | 2011-10-06 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * emacsclient.1: Document how -a "" starts the daemon. | ||
| 4 | |||
| 1 | 2011-09-17 Sven Joachim <svenjoac@gmx.de> | 5 | 2011-09-17 Sven Joachim <svenjoac@gmx.de> |
| 2 | 6 | ||
| 3 | * emacs.1: Escape a dash. | 7 | * 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 (`-'). | |||
| 52 | .B \-a, \-\-alternate-editor=EDITOR | 52 | .B \-a, \-\-alternate-editor=EDITOR |
| 53 | if the Emacs server is not running, run the specified editor instead. | 53 | if the Emacs server is not running, run the specified editor instead. |
| 54 | This can also be specified via the `ALTERNATE_EDITOR' environment variable. | 54 | This can also be specified via the `ALTERNATE_EDITOR' environment variable. |
| 55 | If the value of EDITOR is the empty string, then Emacs is started in | 55 | If the value of EDITOR is the empty string, run `emacs --daemon' to |
| 56 | daemon mode and emacsclient will try to connect to it. | 56 | start Emacs in daemon mode, and try to connect to it. |
| 57 | .TP | 57 | .TP |
| 58 | .B -c, \-\-create-frame | 58 | .B -c, \-\-create-frame |
| 59 | create a new frame instead of trying to use the current Emacs frame | 59 | create a new frame instead of trying to use the current Emacs frame |