Mercurial > emacs

changeset 112086:f5d1f4fc8c14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* emacsclient.1: Arrange options alphabetically (Bug#7620).
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 29 Dec 2010 11:42:53 +0800
parents 19ad0830069c
children 9336a4857507
files doc/man/ChangeLog doc/man/emacsclient.1
diffstat 2 files changed, 25 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/doc/man/ChangeLog	Mon Dec 27 10:27:52 2010 -0500
+++ b/doc/man/ChangeLog	Wed Dec 29 11:42:53 2010 +0800
@@ -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.
--- a/doc/man/emacsclient.1	Mon Dec 27 10:27:52 2010 -0500
+++ b/doc/man/emacsclient.1	Wed Dec 29 11:42:53 2010 +0800
@@ -49,36 +49,36 @@
 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
-.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
 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 \-V, \-\-version
 print version information and exit
 .TP