diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-09-06 02:05:18 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-09-06 02:05:18 +0200 |
| commit | 6a19f2a024b4cede80e2896318696008d1dd1b21 (patch) | |
| tree | 4295e750c4151f90522de8a6c89a7fcf94c79980 /doc/man | |
| parent | b648634982bb52be2b21e92d4aeb837621b5ec63 (diff) | |
| download | emacs-6a19f2a024b4cede80e2896318696008d1dd1b21.tar.gz emacs-6a19f2a024b4cede80e2896318696008d1dd1b21.tar.bz2 emacs-6a19f2a024b4cede80e2896318696008d1dd1b21.zip | |
Add new --timeout flag to emacsclient
* lib-src/emacsclient.c (DEFAULT_TIMEOUT): New constant.
(timeout): New static variable.
(longopts, shortopts, decode_options, print_help_and_exit): Add new
flag --timeout.
(set_socket_timeout, check_socket_timeout): New helper functions.
(main): Display a status message or exit after Emacs has not responded
for a while, depending on above new --timeout flag. (Bug#50849)
* doc/emacs/misc.texi (emacsclient Options):
* doc/man/emacsclient.1: Document the above new option.
* etc/NEWS: Announce it.
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/emacsclient.1 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1 index e5d1bbe09ae..83c8a366f8b 100644 --- a/doc/man/emacsclient.1 +++ b/doc/man/emacsclient.1 @@ -1,5 +1,5 @@ .\" See section COPYING for conditions for redistribution. -.TH EMACSCLIENT 1 "2021-11-05" "GNU Emacs" "GNU" +.TH EMACSCLIENT 1 "2022-09-05" "GNU Emacs" "GNU" .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection .\" other params are allowed: see man(7), man(1) .SH NAME @@ -87,9 +87,12 @@ Use TCP configuration file FILENAME for communication. This can also be specified via the EMACS_SERVER_FILE environment variable. .TP .B \-n, \-\-no-wait -Return -immediately without waiting for you to "finish" the buffer in Emacs. -If combined with --eval, this option is ignored. +Return immediately without waiting for you to "finish" the buffer in +Emacs. If combined with --eval, this option is ignored. +.TP +.B \-w, \-\-timeout=N +How long to wait, in seconds, for Emacs to respond before giving up. +The default is 0, which means to wait forever. .TP .B \-nw, \-t, \-\-tty Open a new Emacs frame on the current terminal. |