This stopps 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.
---
I dont't have any encrypted messages for testing but it seems to work
on signed messages (but even that is very lightly tested).
Best wishes
Mark
emacs/notmuch-mua.el | 7 +++++--
test/T310-emacs.sh | 2 --
2 files changed, 5 insertions(+), 4 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/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@hikari>
--text follows this line--
Adrian Perez de Castro <ape...@igalia.com> writes:
-> [ Unknown signature status ]
->
> Hello to all,
>
> I have just heard about Not Much today in some random Linux-related news
--
2.1.4
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
