diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-02 15:31:19 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-02 15:31:19 -0500 |
| commit | 7c420169baa7c50428589cca7f8eda71b462eb15 (patch) | |
| tree | b556f9e181818bbaf8b5b425844b4ae26e88f537 /doc/man | |
| parent | bb7f5cbcda931661c8dc3311603ac764fa87a639 (diff) | |
| parent | d12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (diff) | |
| download | emacs-7c420169baa7c50428589cca7f8eda71b462eb15.tar.gz | |
Merge changes from emacs-23 branch
Diffstat (limited to 'doc/man')
| -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 f2810be7f97..55e38e33a0a 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2011-01-02 Jari Aalto <jari.aalto@cante.net> (tiny change) + + * emacsclient.1: Arrange options alphabetically (Bug#7620). + 2010-10-12 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 |