mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-16 02:50:26 -08:00
Code Issues Projects Releases Wiki Activity

* emacsclient.1: Arrange options alphabetically (Bug#7620).

Browse source
This commit is contained in:
Jari Aalto 2010-12-29 11:42:53 +08:00 • committed by Chong Yidong
parent cf07311b88
commit 0bf6f91957
2 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/man/ChangeLog
View file

@ -1,3 +1,7 @@
2010-12-29 Jari Aalto <jari.aalto@cante.net> (tiny change)
* emacsclient.1: Arrange options alphabetically (Bug#7620).
2010-10-10 Glenn Morris <rgm@gnu.org> 2010-10-10 Glenn Morris <rgm@gnu.org>
* emacs.1: Small fixes. * emacs.1: Small fixes.

42
doc/man/emacsclient.1
View file

@ -49,36 +49,36 @@ If you set the variable `server-window' to a window or a frame, `C-x
The programs follow the usual GNU command line syntax, with long The programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-'). options starting with two dashes (`-').
.TP .TP
.B \-nw, \-t, \-\-tty
open a new Emacs frame on the current terminal
.TP
.B -c, \-\-create-frame
create a new frame instead of trying to use the current Emacs frame
.TP
.B \-e, \-\-eval
do not visit files but instead evaluate the arguments as Emacs
Lisp expressions.
.TP
.B \-n, \-\-no-wait
returns
immediately without waiting for you to "finish" the buffer in Emacs.
.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 .B \-a, \-\-alternate-editor=EDITOR
if the Emacs server is not running, run the specified editor instead. if the Emacs server is not running, run the specified editor instead.
This can also be specified via the `ALTERNATE_EDITOR' environment variable. 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 If the value of EDITOR is the empty string, then Emacs is started in
daemon mode and emacsclient will try to connect to it. daemon mode and emacsclient will try to connect to it.
.TP .TP
.B -c, \-\-create-frame
create a new frame instead of trying to use the current Emacs frame
.TP
.B \-d, \-\-display=DISPLAY .B \-d, \-\-display=DISPLAY
tell the server to display the files on the given display. tell the server to display the files on the given display.
.TP .TP
.B \-e, \-\-eval
do not visit files but instead evaluate the arguments as Emacs
Lisp expressions.
.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 \-n, \-\-no-wait
returns
immediately without waiting for you to "finish" the buffer in Emacs.
.TP
.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 .B \-V, \-\-version
print version information and exit print version information and exit
.TP .TP