[PATCH 1/2] notmuch-emacs-mua: remove -C to keep short options compatible with mutt

diff --git a/f4/5ab83508caefd6b9914a671cfda13f3ceb6dcf b/f4/5ab83508caefd6b9914a671cfda13f3ceb6dcf
new file mode 100644 (file)
index 0000000..9c62998
--- /dev/null
+++ b/f4/5ab83508caefd6b9914a671cfda13f3ceb6dcf
@@ -0,0 +1,113 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 51652431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 06:30:07 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.738\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.738 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438, RCVD_IN_DNSWL_LOW=-0.7]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id J+GzkJWhB8w0 for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Mar 2015 06:30:03 -0800 (PST)\r
+Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com\r
+       [209.85.212.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 17D7C431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 06:30:02 -0800 (PST)\r
+Received: by wibbs8 with SMTP id bs8so9848235wib.4\r
+       for <notmuch@notmuchmail.org>; Sat, 07 Mar 2015 06:30:02 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+       bh=D7oMCs2EZ5G8HthJ3BSVYKNq85MDb4YrkHe0586zmSI=;\r
+       b=Y/I6rvKsMPscqk6TUcP8pOGW7VEIp1ZmZJ3Ck8+9OEAgqjQvEdW/I1XBKJ05JeyGTM\r
+       pbzKEpfQScOmo8IkymgdsZgtzTgh5B2NoLO0MkNYOlA5BzTXGAU4DDU3lT9owJmWm0El\r
+       rkGnj19kT8gbvXaVPtZyEFYMnM3nem5m7qwMGXJja077ufBXCiehhZdAbDLnFy7FxVM9\r
+       OGkXbd4NoBjfv5zPhhV//KUJEVKpyI0nUJmhVcUZEm8y98LNoeQdc4P4VfeysXSq56wJ\r
+       uT0lLXyaoo13VJvTcr1LGQo+TtzE6/CDlQ1AyweGnoM5Y5qX68pjw5cWVCfngZbk1vWd\r
+       cXbg==\r
+X-Gm-Message-State:\r
+ ALoCoQlOCJIudt29StkAMqxIKnkUYaDtB+4J0kd/3/otx8aDkrGHTsMjJd0FDfDy4PY6L70UgvTS\r
+X-Received: by 10.180.8.165 with SMTP id s5mr42826249wia.16.1425738602115;\r
+       Sat, 07 Mar 2015 06:30:02 -0800 (PST)\r
+Received: from localhost (mobile-internet-bcee3b-76.dhcp.inet.fi.\r
+       [188.238.59.76]) by mx.google.com with ESMTPSA id\r
+       bo1sm19590030wjb.15.2015.03.07.06.30.00\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Sat, 07 Mar 2015 06:30:01 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] notmuch-emacs-mua: remove -C to keep short options\r
+       compatible with mutt\r
+Date: Sat,  7 Mar 2015 16:30:19 +0200\r
+Message-Id: <1425738620-6972-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 07 Mar 2015 14:30:07 -0000\r
+\r
+Notmuch uses long options exclusively all around. The short options in\r
+notmuch-emacs-mua are intentionally just a compatible subset of\r
+mutt(1). Keep it this way, if only to make documenting the fact easy!\r
+\r
+The Notmuch style --client long option remains, of course.\r
+---\r
+ doc/man1/notmuch-emacs-mua.rst | 2 +-\r
+ notmuch-emacs-mua              | 5 +++--\r
+ 2 files changed, 4 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst\r
+index eb47098e11ca..32b728639188 100644\r
+--- a/doc/man1/notmuch-emacs-mua.rst\r
++++ b/doc/man1/notmuch-emacs-mua.rst\r
+@@ -18,7 +18,7 @@ Supported options for **notmuch-emacs-mua** include\r
+     ``-h, --help``\r
+         Display help.\r
+ \r
+-    ``-C, --client``\r
++    ``--client``\r
+         Use emacsclient, rather than emacs. This will start\r
+         an emacs daemon process if necessary.\r
+ \r
+diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua\r
+index b8cbc822fe89..13f67bee4417 100755\r
+--- a/notmuch-emacs-mua\r
++++ b/notmuch-emacs-mua\r
+@@ -38,7 +38,8 @@ CLIENT_TYPE="-c"\r
+ ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"\r
+ ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))"\r
+ \r
+-while getopts :s:c:b:i:hC opt; do\r
++# Short options compatible with mutt(1).\r
++while getopts :s:c:b:i:h opt; do\r
+     # Handle errors and long options.\r
+     case "${opt}" in\r
+       :)\r
+@@ -79,7 +80,7 @@ while getopts :s:c:b:i:hC opt; do\r
+       --help|h)\r
+           exec man notmuch-emacs-mua\r
+           ;;\r
+-      --client|C)\r
++      --client)\r
+           USE_EMACSCLIENT="yes"\r
+           ;;\r
+       --subject|s)\r
+-- \r
+2.1.4\r
+\r