[PATCH v2 1/2] emacs: Always insert crypto buttons.

diff --git a/1d/0abaf7b2d5b1570726863e6d791a90a892f140 b/1d/0abaf7b2d5b1570726863e6d791a90a892f140
new file mode 100644 (file)
index 0000000..d96f541
--- /dev/null
+++ b/1d/0abaf7b2d5b1570726863e6d791a90a892f140
@@ -0,0 +1,142 @@
+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 B59506DE01C2\r
+ for <notmuch@notmuchmail.org>; Sun,  3 Apr 2016 08:38:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.272\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.272 tagged_above=-999 required=5 tests=[AWL=0.339, \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 0Aj05nmpVgbw for <notmuch@notmuchmail.org>;\r
+ Sun,  3 Apr 2016 08:38:31 -0700 (PDT)\r
+Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com\r
+ [209.85.215.66])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id C3ABA6DE02C9\r
+ for <notmuch@notmuchmail.org>; Sun,  3 Apr 2016 08:38:30 -0700 (PDT)\r
+Received: by mail-lf0-f66.google.com with SMTP id f127so19003080lff.1\r
+ for <notmuch@notmuchmail.org>; Sun, 03 Apr 2016 08:38:30 -0700 (PDT)\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=mSW87U1TJsS4e2lRRVE0Yf9SOVaFuzhVTrDQnuNG5o4=;\r
+ b=EL3Cr9WGwBVEdMrmiBmwhU1zO4ZwN7ulsr1Pg6WcbjCYYLYWDWWQnbADToMr6La/EJ\r
+ a62J76wiZx55Sadhaw90YvV6tiMvOiK6oAWW7s9Ik/2AcZXzPME/sIi9B9jMqiaIvzK+\r
+ qdXC3m5gKnPwudXB3t+9OWFZEvStRVir2kuRXoR0mqYBDmui3/PSKp7kmHB+2Pknqt8J\r
+ zRdlwwHez4nPMHCQVpqoEBiU7yNGbvW0i0tlgDcCUXDhrV1/B+CuA68zkAPEo91OMme6\r
+ MCvZiJYa/gmZ18z9Gy+rLr3/0mTepz9wlhHq3KatWVYHFnHGbq6kNoprrSd6vWSlr/hA\r
+ DxOA==\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=mSW87U1TJsS4e2lRRVE0Yf9SOVaFuzhVTrDQnuNG5o4=;\r
+ b=fTNRi0a6lwKG+MC3mW1RQOTgBs+N7Ll5zmD25Rmj0vkpplx2LfEO16123rE86RPMnw\r
+ sEcPZlIkYp4m0PpSdlawnvQiNJf18mWLhYEcnsdF9lmQPXi7Q12JH9z2wi9AE27/gzwK\r
+ mOEl6n7y+BRhBtPkhpeSXdjvGOtKBj9Q0gjkzLSsZzQR7wWGpmUOftRu9w3+Y9zg6cxw\r
+ MAKYrt71PsaLutjKZgkMRtEs5LtoF+h3WZHm3wsbM5MXi2En1yx1do17vA91/VBwtQal\r
+ LmwdXHcIMRxM7sPy+3IRen7L98h8I7JcG7EsVxBcuGpwDA9VsBaLJYKWjD4AN8hghrbe\r
+ FpCg==\r
+X-Gm-Message-State:\r
+ AD7BkJKT0yJwdjhctcRDeuLqFPz8Lfe1cv0lZ9HU3DH660jKi+ffK3X8MZOsNabpbiPmmQ==\r
+X-Received: by 10.194.89.70 with SMTP id bm6mr1391419wjb.0.1459697907030;\r
+ Sun, 03 Apr 2016 08:38:27 -0700 (PDT)\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 192sm9261837wmw.0.2016.04.03.08.38.25\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sun, 03 Apr 2016 08:38:26 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 1a35477d\r
+ for <notmuch@notmuchmail.org>; Sun, 3 Apr 2016 15:38:23 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/2] emacs: Always insert crypto buttons.\r
+Date: Sun,  3 Apr 2016 16:38:22 +0100\r
+Message-Id: <1459697903-32673-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1459697903-32673-1-git-send-email-dme@dme.org>\r
+References: <1459697903-32673-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: Sun, 03 Apr 2016 15:38:39 -0000\r
+\r
+When no decryption or signature examination is\r
+happening (i.e. `notmuch-crypto-process-mime' is `nil') insert buttons\r
+that indicate this, rather than remaining silent.\r
+---\r
+ emacs/notmuch-show.el | 34 +++++++++++-----------------------\r
+ 1 file changed, 11 insertions(+), 23 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 7c34449..fcb539a 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -642,15 +642,10 @@ will return nil if the CID is unknown or cannot be retrieved."\r
+ (defun notmuch-show-insert-part-multipart/signed (msg part content-type nth depth button)\r
+   (when button\r
+     (button-put button 'face 'notmuch-crypto-part-header))\r
+-  ;; Add signature status button if sigstatus provided.\r
+-  (if (plist-member part :sigstatus)\r
+-      (let* ((from (notmuch-show-get-header :From msg))\r
+-           (sigstatus (car (plist-get part :sigstatus))))\r
+-      (notmuch-crypto-insert-sigstatus-button sigstatus from))\r
+-    ;; If we're not adding the signature status, tell the user how\r
+-    ;; they can get it.\r
+-    (when button\r
+-      (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")))\r
++\r
++  ;; Insert a button detailing the signature status.\r
++  (notmuch-crypto-insert-sigstatus-button (car (plist-get part :sigstatus))\r
++                                        (notmuch-show-get-header :From msg))\r
+ \r
+   (let ((inner-parts (plist-get part :content))\r
+       (start (point)))\r
+@@ -666,20 +661,13 @@ will return nil if the CID is unknown or cannot be retrieved."\r
+ (defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth button)\r
+   (when button\r
+     (button-put button 'face 'notmuch-crypto-part-header))\r
+-  ;; Add encryption status button if encryption status is specified.\r
+-  (if (plist-member part :encstatus)\r
+-      (let ((encstatus (car (plist-get part :encstatus))))\r
+-      (notmuch-crypto-insert-encstatus-button encstatus)\r
+-      ;; Add signature status button if signature status is\r
+-      ;; specified.\r
+-      (if (plist-member part :sigstatus)\r
+-          (let* ((from (notmuch-show-get-header :From msg))\r
+-                 (sigstatus (car (plist-get part :sigstatus))))\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
+-    (when button\r
+-      (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")))\r
++\r
++  ;; Insert a button detailing the encryption status.\r
++  (notmuch-crypto-insert-encstatus-button (car (plist-get part :encstatus)))\r
++\r
++  ;; Insert a button detailing the signature status.\r
++  (notmuch-crypto-insert-sigstatus-button (car (plist-get part :sigstatus))\r
++                                        (notmuch-show-get-header :From msg))\r
+ \r
+   (let ((inner-parts (plist-get part :content))\r
+       (start (point)))\r
+-- \r
+2.1.4\r
+\r