[PATCH 2/2] emacs: reply: remove wrong sig/enc status buttons

[David Bremner]

From: Mark Walters <markwalters1009 at gmail.com>

This stops the (usually incorrect) sigstatus and encstatus buttons
appearing when replying in emacs, and updates the test suite to match.

Overriding the status button functions is a little unusual but much
less intrusive than passing an argument all the way down the call
chain. It also makes it clear exactly what it does.

We also hide the application/pgp-encrypted part as it can only contain
"Version: 1". We do this in notmuch show, which means it also happens
when replying.
---
 emacs/notmuch-mua.el  | 7 +++++--
 emacs/notmuch-show.el | 3 +++
 test/T310-emacs.sh    | 2 --
 test/T350-crypto.sh   | 3 ---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index fadf20f..55bc267 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -253,8 +253,11 @@ mutiple parts get a header."
 		       (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
 		       ;; Don't indent multipart sub-parts.
 		       (notmuch-show-indent-multipart nil))
-		    (notmuch-show-insert-body original (plist-get original :body) 0)
-		    (buffer-substring-no-properties (point-min) (point-max)))))
+		    ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
+		    (letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore)
+			   ((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore))
+			  (notmuch-show-insert-body original (plist-get original :body) 0)
+			  (buffer-substring-no-properties (point-min) (point-max))))))
 
 	(set-mark (point))
 	(goto-char start)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 5a585f3..641398d 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -682,6 +682,9 @@ will return nil if the CID is unknown or cannot be retrieved."
       (indent-rigidly start (point) 1)))
   t)
 
+(defun notmuch-show-insert-part-application/pgp-encrypted (msg part content-type nth depth button)
+  t)
+
 (defun notmuch-show-insert-part-multipart/* (msg part content-type nth depth button)
   (let ((inner-parts (plist-get part :content))
 	(start (point)))
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index 202fc3b..21675b6 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -384,8 +384,6 @@ References: <20091118002059.067214ed at hikari>
 --text follows this line--
 Adrian Perez de Castro <aperez at igalia.com> writes:
 
-> [ Unknown signature status ]
->
 > Hello to all,
 >
 > I have just heard about Not Much today in some random Linux-related news
diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh
index 28ea9ad..df2dc74 100755
--- a/test/T350-crypto.sh
+++ b/test/T350-crypto.sh
@@ -331,9 +331,6 @@ Subject: Re: test encrypted message 002
 <#secure method=pgpmime mode=signencrypt>
 Notmuch Test Suite <test_suite at notmuchmail.org> writes:
 
-> [ Decryption successful ]
-> [ Good signature by:  Notmuch Test Suite <test_suite at notmuchmail.org> (INSECURE!) ]
-> Version: 1
 > This is another test encrypted message.
 EOF
 test_expect_equal_file EXPECTED OUTPUT.clean
-- 
2.9.3