diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/misc.texi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index df74577592a..d8ad0bee34f 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -2089,6 +2089,13 @@ all server buffers are finished. You can take as long as you like to edit the server buffers within Emacs, and they are @emph{not} killed when you type @kbd{C-x #} in them. +@item -w +@itemx --timeout=@var{N} +Wait for a response from Emacs for @var{N} seconds before giving up. +If there is no response within that time, @command{emacsclient} will +display a warning and exit. The default is @samp{0}, which means to +wait forever. + @item --parent-id @var{id} Open an @command{emacsclient} frame as a client frame in the parent X window with id @var{id}, via the XEmbed protocol. Currently, this |