From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jari Aalto Newsgroups: gmane.emacs.bugs Subject: bug#7622: [PATCH] lib-src/emacsclient.c: Change -H to -h. Order options alphabetically Date: Sun, 12 Dec 2010 16:48:37 +0200 Message-ID: <87r5dn59oa.fsf@picasso.cante.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: dough.gmane.org 1292165560 16223 80.91.229.12 (12 Dec 2010 14:52:40 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 12 Dec 2010 14:52:40 +0000 (UTC) To: 7622@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 12 15:52:35 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PRnHv-00015p-61 for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Dec 2010 15:52:35 +0100 Original-Received: from localhost ([127.0.0.1]:58671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRnHu-0003yK-Oj for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Dec 2010 09:52:34 -0500 Original-Received: from [140.186.70.92] (port=50249 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRnHp-0003y9-G6 for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 09:52:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PRnHn-0002Bh-Qs for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 09:52:29 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PRnHn-0002Bd-Nm for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 09:52:27 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PRn8g-0001b7-IU; Sun, 12 Dec 2010 09:43:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jari Aalto Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 12 Dec 2010 14:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 7622 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: submit@debbugs.gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.12921649566102 (code B ref -1); Sun, 12 Dec 2010 14:43:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Dec 2010 14:42:36 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PRn8F-0001aN-GB for submit@debbugs.gnu.org; Sun, 12 Dec 2010 09:42:35 -0500 Original-Received: from emh05.mail.saunalahti.fi ([62.142.5.111]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PRn8C-0001a6-9o for submit@debbugs.gnu.org; Sun, 12 Dec 2010 09:42:34 -0500 Original-Received: from saunalahti-vams (vs3-10.mail.saunalahti.fi [62.142.5.94]) by emh05-2.mail.saunalahti.fi (Postfix) with SMTP id 706A68BE63 for ; Sun, 12 Dec 2010 16:48:39 +0200 (EET) Original-Received: from emh04.mail.saunalahti.fi ([62.142.5.110]) by vs3-10.mail.saunalahti.fi ([62.142.5.94]) with SMTP (gateway) id A06F496A45D; Sun, 12 Dec 2010 16:48:39 +0200 Original-Received: from picasso.cante.net (a91-155-187-216.elisa-laajakaista.fi [91.155.187.216]) by emh04.mail.saunalahti.fi (Postfix) with ESMTP id 4F6A541BE7 for ; Sun, 12 Dec 2010 16:48:37 +0200 (EET) Mail-Copies-To: poster X-Antivirus: VAMS X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 12 Dec 2010 09:43:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:42438 Archived-At: --=-=-= Content-Type: text/plain Package: emacs Version: 23.2+1-5.1 Severity: wishlist Tags: patch The patch changes help option to lowercase -h like found e.g. in GNU cp(1). The option help is also presented alphabetically. The patch is against Git: 74bd01f 2010-12-12 Merge branch 'master' of git://git.sv.gnu.org/emacs [ lib-src/ChangeLog ] 2010-12-12 Jari Aalto * emacsclient.c (decode_options): Change help option from -H to -h. (print_help_and_exit): Order options alphabetically. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-emacsclient.c-decode_options-Change-help-option-from.patch >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 --=-=-= Content-Type: text/plain -- System Information Debian Release: squeeze/sid APT Prefers testing APT policy: (990, testing) (500, unstable) (1, experimental) Architecture: amd64 Kernel: Linux picasso 2.6.32-5-amd64 #1 SMP Fri Sep 17 21:50:19 UTC 2010 x86_64 GNU/Linux Locale: LANG=en_DK.UTF-8 -- Versions of packages `emacs depends on'. Depends: emacs23 23.2+1-5.1 GNU Emacs is the extensible self-documenting emacs23-lucid 23.2+1-5.1 GNU Emacs is the extensible self-documenting emacs23-nox 23.2+1-5.1 GNU Emacs is the extensible self-documenting --=-=-=--