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

diff --git a/08/fbdbbd2893021e3bd42b67a7ab20038ca04381 b/08/fbdbbd2893021e3bd42b67a7ab20038ca04381
new file mode 100644 (file)
index 0000000..374e385
--- /dev/null
+++ b/08/fbdbbd2893021e3bd42b67a7ab20038ca04381
@@ -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 2F041431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Mar 2013 08:43:31 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 FPsxB0o95iNH for <notmuch@notmuchmail.org>;\r
+       Fri,  1 Mar 2013 08:43:30 -0800 (PST)\r
+Received: from mail-la0-f42.google.com (mail-la0-f42.google.com\r
+       [209.85.215.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7B7B4431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Mar 2013 08:43:30 -0800 (PST)\r
+Received: by mail-la0-f42.google.com with SMTP id fe20so3156460lab.1\r
+       for <notmuch@notmuchmail.org>; Fri, 01 Mar 2013 08:43:29 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references:x-gm-message-state;\r
+       bh=m69Rx5gBhXupvwowVG1PIR6qs1xhAsDIxIomeL3Y+1I=;\r
+       b=JuFCsOmWcHya68L7rhaX0ExV4TwvC6TblvRNRaL+N9o+YArSqlWR8zTFmILVETgh1N\r
+       idT7W0i/JDE9IvQc3I6P/T97ONmhWGPUFInp1J+So84CKPoTzwTm2kbIaOhBg4mg4929\r
+       JkUalyEKa0Mh6nGfwI+gjs4URsKlj5ifKrFfsXlFGefvZxIM5icIknq985v3fQ9B8kz1\r
+       JEY8aKonWfhGuDr8VN5dA8tw5iNgYKbe4Mph3GNcivGSybyqa8Kt8luUMsxLN+UnIP38\r
+       rxjE/bvGlBkgCy2fhBpwErM75TLfvI9cWLqTULueOzpVakLjWRzbX0pE78btA47lrtae\r
+       iH3w==\r
+X-Received: by 10.152.133.52 with SMTP id oz20mr9677027lab.30.1362156207557;\r
+       Fri, 01 Mar 2013 08:43:27 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id tm10sm6938877lab.10.2013.03.01.08.43.25\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 01 Mar 2013 08:43:26 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] man: show and reply --decrypt option requires gpg-agent\r
+Date: Fri,  1 Mar 2013 18:43:26 +0200\r
+Message-Id: <1362156206-19481-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1361950838-22919-1-git-send-email-jani@nikula.org>\r
+References: <1361950838-22919-1-git-send-email-jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQlIGu4A+w/O7frl0lq9aJigl9gQpjr0ql1JIHyEGFZbgfgq47et1M4ebnjtj2vzCUr6XshJ\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:43:31 -0000\r
+\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
+ \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=json and --format=sexp)\r
+-and the multipart/encrypted part will be replaced by the decrypted\r
+-content.\r
++reported (currently only supported with --format=json and\r
++--format=sexp) 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
+ \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=json and\r
+---format=sexp) and the multipart/encrypted part will be replaced\r
+-by the decrypted content.  Implies --verify.\r
++--format=sexp) 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
+ \r
+ .RS 4\r
+-- \r
+1.7.10.4\r
+\r