Re: [PATCH] man: show and reply --decrypt option requires gpg-agent

diff --git a/f1/c89f10690fd3b2088401473df8714900f1402c b/f1/c89f10690fd3b2088401473df8714900f1402c
new file mode 100644 (file)
index 0000000..a1c2904
--- /dev/null
+++ b/f1/c89f10690fd3b2088401473df8714900f1402c
@@ -0,0 +1,136 @@
+Return-Path: <jrollins@finestructure.net>\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 B1237431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Mar 2013 08:56:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 LhPbHpCeRJNC for <notmuch@notmuchmail.org>;\r
+       Fri,  1 Mar 2013 08:56:57 -0800 (PST)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5A56B431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Mar 2013 08:56:57 -0800 (PST)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by earth-doxen-postvirus (Postfix) with ESMTP id EB2BC66E00F2;\r
+       Fri,  1 Mar 2013 08:56:54 -0800 (PST)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-76-166-145-133.socal.res.rr.com\r
+       [76.166.145.133]) (Authenticated sender: jrollins)\r
+       by earth-doxen-submit (Postfix) with ESMTP id 0287C66E0026;\r
+       Fri,  1 Mar 2013 08:56:51 -0800 (PST)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 63AF461E01; Fri,  1 Mar 2013 08:56:51 -0800 (PST)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] man: show and reply --decrypt option requires gpg-agent\r
+In-Reply-To: <1362156206-19481-1-git-send-email-jani@nikula.org>\r
+References: <1361950838-22919-1-git-send-email-jani@nikula.org>\r
+       <1362156206-19481-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.15+8~gd4a7374 (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 01 Mar 2013 08:56:49 -0800\r
+Message-ID: <87fw0foy7i.fsf@servo.finestructure.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha256; protocol="application/pgp-signature"\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: Fri, 01 Mar 2013 16:56:58 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Fri, Mar 01 2013, Jani Nikula <jani@nikula.org> wrote:\r
+> ---\r
+>  man/man1/notmuch-reply.1 |    9 ++++++---\r
+>  man/man1/notmuch-show.1  |    9 +++++++--\r
+>  2 files changed, 13 insertions(+), 5 deletions(-)\r
+>\r
+> diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1\r
+> index 454bdee..bf2021f 100644\r
+> --- a/man/man1/notmuch-reply.1\r
+> +++ b/man/man1/notmuch-reply.1\r
+> @@ -89,9 +89,12 @@ user's addresses.\r
+>=20=20\r
+>  Decrypt any MIME encrypted parts found in the selected content\r
+>  (ie. "multipart/encrypted" parts). Status of the decryption will be\r
+> -reported (currently only supported with --format=3Djson and --format=3Ds=\r
+exp)\r
+> -and the multipart/encrypted part will be replaced by the decrypted\r
+> -content.\r
+> +reported (currently only supported with --format=3Djson and\r
+> +--format=3Dsexp) and on successful decryption the multipart/encrypted\r
+> +part will be replaced by the decrypted content.\r
+> +\r
+> +Decryption expects a functioning \fBgpg-agent\fR(1) to provide any\r
+> +needed credentials. Without one, the decryption will fail.\r
+>  .RE\r
+>=20=20\r
+>  See \fBnotmuch-search-terms\fR(7)\r
+> diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1\r
+> index 8be9eae..7697dfc 100644\r
+> --- a/man/man1/notmuch-show.1\r
+> +++ b/man/man1/notmuch-show.1\r
+> @@ -163,8 +163,13 @@ will be replaced by the signed data.\r
+>  Decrypt any MIME encrypted parts found in the selected content\r
+>  (ie. "multipart/encrypted" parts). Status of the decryption will be\r
+>  reported (currently only supported with --format=3Djson and\r
+> ---format=3Dsexp) and the multipart/encrypted part will be replaced\r
+> -by the decrypted content.  Implies --verify.\r
+> +--format=3Dsexp) and on successful decryption the multipart/encrypted\r
+> +part will be replaced by the decrypted content.\r
+> +\r
+> +Decryption expects a functioning \fBgpg-agent\fR(1) to provide any\r
+> +needed credentials. Without one, the decryption will fail.\r
+> +\r
+> +Implies --verify.\r
+>  .RE\r
+>=20=20\r
+>  .RS 4\r
+> --=20\r
+> 1.7.10.4\r
+\r
+LGTM.\r
+\r
+jamie.\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.12 (GNU/Linux)\r
+\r
+iQIcBAEBCAAGBQJRMN3RAAoJEO00zqvie6q8CMMQAKbIODBPCQUG4X9WPioMQM+R\r
+ItgEvZFRrC/tCOnQM1nhYAfkLG5X7cJ2kHiKdDGY2Df2T3r8g1lgQWSLUSjuU5N3\r
+eQr8kADb7hSNFfKKH//3hFtGQv42o+SzjC1B0mashoXVefwj9hCHOrGlojibilnJ\r
+3aAqAS3IxY5UBcRy16tp2rAgxRrdiZhFpXMKrSm43VU4yNFG+33HBc+l0ketJv0L\r
+K7lqtc1UmUmTwb4yrgkI/xqklPKFZgLJY+ZOF+N0U6uhN5o6IjNACnZvfkBTEzf8\r
+J3jdkLXvPJpzcVfprh602OjOUtpWWOxHg8HH4IAnO+mjwzERS+Rvl8VE0PD3M74s\r
+kuNEO9awFgHTHCiSodWkkl2vP39O7b7GmZmMipLHYR7YMEYPLqsf7X5wYhqw2Ucz\r
+ol4DBNmRM8q40dJ9nMm/EoGMUvEIOC1RdetndAV6Ojt2TZg62mqJU/QMhaBL/oav\r
+OfhIw3+yDsKWhHMXoCcBRXqqAqdgNZYV/atQ0S2nVNA92fXqYHWIJb6wfNIEjMNV\r
+cV6h9OZBDTo8e7efBBG8xT/XSfIKL8potAe9vKDhNvdt1oagkyztauBH0Xw8ZOLS\r
+txngEYg27VNkcBuJR24uQBOcp2G83x89E2nI/oW9624NjkpDIQ/uCMHl1Ymjhw6Y\r
+5lY4NR0heb7/fMtXybxH\r
+=Ff1U\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r