From 1558f8624d763dd396a0d9746eab00a73be56931 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sat, 7 Mar 2015 21:23:17 +0200
Subject: [PATCH] Re: [PATCH 1/2] notmuch-emacs-mua: remove -C to keep short
 options	compatible with mutt

---
 52/a97f2678deef94cedc7cb0ff69ce8b002ab0ee | 111 ++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 52/a97f2678deef94cedc7cb0ff69ce8b002ab0ee

diff --git a/52/a97f2678deef94cedc7cb0ff69ce8b002ab0ee b/52/a97f2678deef94cedc7cb0ff69ce8b002ab0ee
new file mode 100644
index 000000000..a8b3b17ab
--- /dev/null
+++ b/52/a97f2678deef94cedc7cb0ff69ce8b002ab0ee
@@ -0,0 +1,111 @@
+Return-Path: <tomi.ollila@iki.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id B2584431FBC
+	for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 11:23:45 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 2.438
+X-Spam-Level: **
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5
+	tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id KNCDsiwY+h7s for <notmuch@notmuchmail.org>;
+	Sat,  7 Mar 2015 11:23:42 -0800 (PST)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 677AF431FAE
+	for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 11:23:42 -0800 (PST)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id E14791000F3;
+	Sat,  7 Mar 2015 21:23:17 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
+Subject: Re: [PATCH 1/2] notmuch-emacs-mua: remove -C to keep short
+	options	compatible with mutt
+In-Reply-To: <1425738620-6972-1-git-send-email-jani@nikula.org>
+References: <1425738620-6972-1-git-send-email-jani@nikula.org>
+User-Agent: Notmuch/0.19+53~gb45d2f9 (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Sat, 07 Mar 2015 21:23:17 +0200
+Message-ID: <m2vbicd32y.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Sat, 07 Mar 2015 19:23:45 -0000
+
+On Sat, Mar 07 2015, Jani Nikula <jani@nikula.org> wrote:
+
+> Notmuch uses long options exclusively all around. The short options in
+> notmuch-emacs-mua are intentionally just a compatible subset of
+> mutt(1). Keep it this way, if only to make documenting the fact easy!
+>
+> The Notmuch style --client long option remains, of course.
+
+Series LGTM.
+
+Tomi
+
+> ---
+>  doc/man1/notmuch-emacs-mua.rst | 2 +-
+>  notmuch-emacs-mua              | 5 +++--
+>  2 files changed, 4 insertions(+), 3 deletions(-)
+>
+> diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
+> index eb47098e11ca..32b728639188 100644
+> --- a/doc/man1/notmuch-emacs-mua.rst
+> +++ b/doc/man1/notmuch-emacs-mua.rst
+> @@ -18,7 +18,7 @@ Supported options for **notmuch-emacs-mua** include
+>      ``-h, --help``
+>          Display help.
+>  
+> -    ``-C, --client``
+> +    ``--client``
+>          Use emacsclient, rather than emacs. This will start
+>          an emacs daemon process if necessary.
+>  
+> diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
+> index b8cbc822fe89..13f67bee4417 100755
+> --- a/notmuch-emacs-mua
+> +++ b/notmuch-emacs-mua
+> @@ -38,7 +38,8 @@ CLIENT_TYPE="-c"
+>  ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"
+>  ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))"
+>  
+> -while getopts :s:c:b:i:hC opt; do
+> +# Short options compatible with mutt(1).
+> +while getopts :s:c:b:i:h opt; do
+>      # Handle errors and long options.
+>      case "${opt}" in
+>  	:)
+> @@ -79,7 +80,7 @@ while getopts :s:c:b:i:hC opt; do
+>  	--help|h)
+>  	    exec man notmuch-emacs-mua
+>  	    ;;
+> -	--client|C)
+> +	--client)
+>  	    USE_EMACSCLIENT="yes"
+>  	    ;;
+>  	--subject|s)
+> -- 
+> 2.1.4
+>
+> _______________________________________________
+> notmuch mailing list
+> notmuch@notmuchmail.org
+> http://notmuchmail.org/mailman/listinfo/notmuch
-- 
2.26.2