+.\" See section COPYING for conditions for redistribution.
.TH EMACSCLIENT 1
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
The programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
.TP
-.B \-n, \-\-no-wait
-returns
-immediately without waiting for you to "finish" the buffer in Emacs.
+.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, 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
+.TP
+.B \-F, \-\-frame-parameters=ALIST
+set the parameters of a newly-created frame.
+.TP
+.B \-d, \-\-display=DISPLAY
+tell the server to display the files on the given display.
.TP
.B \-e, \-\-eval
do not visit files but instead evaluate the arguments as Emacs
Lisp expressions.
.TP
-.B \-s, \-\-socket-name=FILENAME
-use socket named FILENAME for communication.
-.TP
.B \-f, \-\-server-file=FILENAME
use TCP configuration file FILENAME for communication.
This can also be specified via the `EMACS_SERVER_FILE' environment variable.
.TP
-.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.
+.B \-n, \-\-no-wait
+returns
+immediately without waiting for you to "finish" the buffer in Emacs.
.TP
-.B \-d, \-\-display=DISPLAY
-tell the server to display the files on the given display.
+.B \-nw, \-t, \-\-tty
+open a new Emacs frame on the current terminal
+.TP
+.B \-s, \-\-socket-name=FILENAME
+use socket named FILENAME for communication.
.TP
.B \-V, \-\-version
print version information and exit
.TP
-.B \-h, \-\-help
+.B \-H, \-\-help
print this usage information message and exit
+.SH "EXIT STATUS"
+Normally, the exit status is 0. If emacsclient shuts down due to
+Emacs signaling an error, the exit status is 1.
.SH "SEE ALSO"
The program is documented fully in
.IR "Using Emacs as a Server"
.SH COPYING
This manual page is in the public domain.
-.\" arch-tag: 2b35e723-b197-4073-8752-231bc8b3d3f3