diff options
| author | Jari Aalto <jari.aalto@cante.net> | 2010-12-29 11:42:53 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-12-29 11:42:53 +0800 |
| commit | 0bf6f91957c33fbea0024495d996f5267e45bc6c (patch) | |
| tree | 54a7b5c0023e9ca6716a73372a795ffbb30ae4aa /doc | |
| parent | cf07311b884db06d8b313c057f4832d5693ac2b5 (diff) | |
| download | emacs-0bf6f91957c33fbea0024495d996f5267e45bc6c.tar.gz | |
* emacsclient.1: Arrange options alphabetically (Bug#7620).
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/man/emacsclient.1 | 30 |
2 files changed, 19 insertions, 15 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 1e355687c00..fa1d594825c 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -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> * emacs.1: Small fixes. diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1 index 16bfb73e16b..6af699e036b 100644 --- a/doc/man/emacsclient.1 +++ b/doc/man/emacsclient.1 @@ -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 options starting with two dashes (`-'). .TP -.B \-nw, \-t, \-\-tty -open a new Emacs frame on the current terminal +.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, then Emacs is started in +daemon mode and emacsclient will 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 \-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 \-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 \-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. -If the value of EDITOR is the empty string, then Emacs is started in -daemon mode and emacsclient will try to connect to it. -.TP -.B \-d, \-\-display=DISPLAY -tell the server to display the files on the given display. -.TP .B \-V, \-\-version print version information and exit .TP |