From f9c51ef32df48c3a01cb32e9b67aa5694794ccef Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sun, 12 Dec 2010 16:41:47 +0200 Subject: [PATCH] * emacsclient.c (decode_options): Change help option from -H to -h. (print_help_and_exit): Order options alphabetically. Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- lib-src/emacsclient.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 48ea3d2..9759898 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -516,9 +516,9 @@ decode_options (int argc, char **argv) { int opt = getopt_long_only (argc, argv, #ifndef NO_SOCKETS_IN_FILE_SYSTEM - "VHnea:s:f:d:tc", + "Vhnea:s:f:d:tc", #else - "VHnea:f:d:tc", + "Vhnea:f:d:tc", #endif longopts, 0); @@ -581,7 +581,7 @@ decode_options (int argc, char **argv) current_frame = 0; break; - case 'H': + case 'h': print_help_and_exit (); break; @@ -646,29 +646,31 @@ Tell the Emacs server to visit the specified files.\n\ Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\ \n\ The following OPTIONS are accepted:\n\ --V, --version Just print version info and return\n\ --H, --help Print this usage information message\n\ --nw, -t, --tty Open a new Emacs frame on the current terminal\n\ +-a EDITOR, --alternate-editor=EDITOR\n\ + Editor to fallback to if the server is not running\n" +#ifndef WINDOWSNT +" If EDITOR is the empty string, start Emacs in daemon\n\ + mode and try connecting again\n" +#endif /* not WINDOWSNT */ +"\ -c, --create-frame Create a new frame instead of trying to\n\ use the current Emacs frame\n\ --e, --eval Evaluate the FILE arguments as ELisp expressions\n\ --n, --no-wait Don't wait for the server to return\n\ -d DISPLAY, --display=DISPLAY\n\ Visit the file in the given display\n\ +-e, --eval Evaluate the FILE arguments as ELisp expressions\n\ +-f SERVER, --server-file=SERVER\n\ + Set filename of the TCP authentication file\n\ +-n, --no-wait Don't wait for the server to return\n\ +-nw, -t, --tty Open a new Emacs frame on the current terminal\n\ --parent-id=ID Open in parent window ID, via XEmbed\n" #ifndef NO_SOCKETS_IN_FILE_SYSTEM "-s SOCKET, --socket-name=SOCKET\n\ Set filename of the UNIX socket for communication\n" #endif -"-f SERVER, --server-file=SERVER\n\ - Set filename of the TCP authentication file\n\ --a EDITOR, --alternate-editor=EDITOR\n\ - Editor to fallback to if the server is not running\n" -#ifndef WINDOWSNT -" If EDITOR is the empty string, start Emacs in daemon\n\ - mode and try connecting again\n" -#endif /* not WINDOWSNT */ -"\n\ +"\ +-h, --help Print this usage information message\n\ +-V, --version Just print version info and return\n\ +\n\ Report bugs with M-x report-emacs-bug.\n", progname); exit (EXIT_SUCCESS); } -- 1.7.2.3