[PATCH v1 1/3] emacs: `notmuch-show-insert-part-multipart/encrypted' should not assum...

diff --git a/4d/ce81e70c51edbca7631879e4f833ec5675c6da b/4d/ce81e70c51edbca7631879e4f833ec5675c6da
new file mode 100644 (file)
index 0000000..8b6901b
--- /dev/null
+++ b/4d/ce81e70c51edbca7631879e4f833ec5675c6da
@@ -0,0 +1,102 @@
+Return-Path: <dme@dme.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 arlo.cworth.org (Postfix) with ESMTP id 60A856DE13CC\r
+ for <notmuch@notmuchmail.org>; Tue,  8 Mar 2016 09:13:08 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.378\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.378 tagged_above=-999 required=5 tests=[AWL=0.445, \r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652,\r
+ UNPARSEABLE_RELAY=0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id XJhImosiTABm for <notmuch@notmuchmail.org>;\r
+ Tue,  8 Mar 2016 09:13:05 -0800 (PST)\r
+Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com\r
+ [74.125.82.65]) by arlo.cworth.org (Postfix) with ESMTPS id 5752F6DE0B22 for\r
+ <notmuch@notmuchmail.org>; Tue,  8 Mar 2016 09:13:05 -0800 (PST)\r
+Received: by mail-wm0-f65.google.com with SMTP id 1so5335495wmg.2\r
+ for <notmuch@notmuchmail.org>; Tue, 08 Mar 2016 09:13:05 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:subject:date:message-id:in-reply-to:references;\r
+ bh=yEviyL3HnzFwioEaU5ixRQjJtRfhDpYqznvy0qZZVv4=;\r
+ b=WfUKWVIrBZqyFCQB83Y+0V4xat4IJ2P3qdaOTfdUwONvMJXwkO+mWt545jWaKTDAx6\r
+ Mh6E/TSN9UqpCof67J96C2GNQnlYLNcpQ7TQ0UkLsccmwgqAx8MLDmYVHVe6wK7H4n5Z\r
+ gv5VpnqX2h8lBK3nPjZNBxNkpNjrP0+rg0WcLOnzGUAHxpkin1yKr+SUGxcFLA6iTQCI\r
+ UXKh1oamELXKFiPjk/gCSX6Fahzv1o65p5/hTGwnwEhDL1CRxnbQ3w0vvFcFNMc/Jv0z\r
+ OUV6ngbmmLHwYPxHEo94j2R/cMBrbLiNBv3b8/CqNj/zwedibM6YzRFNuEK7qvyGXBR9\r
+ IyUQ==\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:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=yEviyL3HnzFwioEaU5ixRQjJtRfhDpYqznvy0qZZVv4=;\r
+ b=i4VN0ukOITOzX3mZArlFJfWxwU47Jo5vK8YXRBouv+cGCJ3eJwXZO7JgLQlu9TRUnm\r
+ L0W5m72t7bDBhkHBN26+VsT2IcjdUZ5WMw606r8vjWx0ORuXALIhG6idtNzQEjDQ99mw\r
+ FkeY/0KgWv0n2u+NSkejI+MBXxhBr0z2VjCXdqPDANkp68x4MrIrKD7p7Oyw4fCwXRMZ\r
+ dioeU5a7FbRYRgeb1SFfw+wI+cios8P1su2xj0m3NxIMR0n8ukYblsiaH99V09RH9b4E\r
+ A0Vwc91G5ZOcj3sTNCpk+t/5AO4UucObPKk8T+FJQr6Z0zCHvl7oqqcexOpPjxSPeJKa\r
+ /FNg==\r
+X-Gm-Message-State:\r
+ AD7BkJIYrIcULvQwmN5EpvkR4v5ZoUXGMDhi3zsdkLacHq2R7Po9eUaUkrCyM2FI0sRAfg==\r
+X-Received: by 10.28.130.6 with SMTP id e6mr20869924wmd.71.1457457184105;\r
+ Tue, 08 Mar 2016 09:13:04 -0800 (PST)\r
+Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net.\r
+ [81.149.164.25])\r
+ by smtp.gmail.com with ESMTPSA id l135sm4369544wmb.13.2016.03.08.09.13.02\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 08 Mar 2016 09:13:02 -0800 (PST)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 65f22d11\r
+ for <notmuch@notmuchmail.org>; Tue, 8 Mar 2016 17:12:59 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1 1/3] emacs: `notmuch-show-insert-part-multipart/encrypted'\r
+ should not assume the presence of a button.\r
+Date: Tue,  8 Mar 2016 17:12:57 +0000\r
+Message-Id: <1457457179-4707-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1457457179-4707-1-git-send-email-dme@dme.org>\r
+References: <1457457179-4707-1-git-send-email-dme@dme.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 08 Mar 2016 17:13:08 -0000\r
+\r
+Missed in c802d12a1e43fe69f2fcf7a2f7d44018a55bfb65.\r
+---\r
+ emacs/notmuch-show.el | 3 ++-\r
+ 1 file changed, 2 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 371e62d..6e268f9 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -678,7 +678,8 @@ will return nil if the CID is unknown or cannot be retrieved."\r
+             (notmuch-crypto-insert-sigstatus-button sigstatus from))))\r
+     ;; If we're not adding the encryption status, tell the user how\r
+     ;; they can get it.\r
+-    (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts."))\r
++    (when button\r
++      (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")))\r
+ \r
+   (let ((inner-parts (plist-get part :content))\r
+       (start (point)))\r
+-- \r
+2.1.4\r
+\r