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

diff --git a/52/a97f2678deef94cedc7cb0ff69ce8b002ab0ee b/52/a97f2678deef94cedc7cb0ff69ce8b002ab0ee
new file mode 100644 (file)
index 0000000..a8b3b17
--- /dev/null
+++ b/52/a97f2678deef94cedc7cb0ff69ce8b002ab0ee
@@ -0,0 +1,111 @@
+Return-Path: <tomi.ollila@iki.fi>\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 B2584431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 11:23:45 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 KNCDsiwY+h7s for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Mar 2015 11:23:42 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 677AF431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 11:23:42 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id E14791000F3;\r
+       Sat,  7 Mar 2015 21:23:17 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] notmuch-emacs-mua: remove -C to keep short\r
+       options compatible with mutt\r
+In-Reply-To: <1425738620-6972-1-git-send-email-jani@nikula.org>\r
+References: <1425738620-6972-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.19+53~gb45d2f9 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sat, 07 Mar 2015 21:23:17 +0200\r
+Message-ID: <m2vbicd32y.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 19:23:45 -0000\r
+\r
+On Sat, Mar 07 2015, Jani Nikula <jani@nikula.org> wrote:\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
+Series LGTM.\r
+\r
+Tomi\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r