<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body>Hi Mark. Excellent :-) I'll look out for it in the repository at some point soon. <div>Cheers, </div><div> Matt </div><div><br></div><div style="font-size:100%;color:#000000"><!-- originalMessage --><div>-------- Original message --------</div><div>From: Mark Walters <markwalters1009@gmail.com> </div><div>Date: 15/10/2016 08:09 (GMT+00:00) </div><div>To: matt@bubblegen.co.uk, notmuch@notmuchmail.org, matt@bubblegen.co.uk </div><div>Subject: Re: </div><div><br></div></div><br>On Wed, 12 Oct 2016, Mark Walters <markwalters1009@gmail.com> wrote:<br>> On Tue, 11 Oct 2016, matt@bubblegen.co.uk wrote:<br>>> From: Matthew Lear <matt@bubblegen.co.uk><br>>> To: notmuch@notmuchmail.org<br>>> Cc: Matthew Lear <matt@bubblegen.co.uk><br>>> Subject: [PATCH] Fix reply to encrypted mail when discouraging plain text.<br>>> Date: Tue, 11 Oct 2016 22:24:18 +0100<br>>> Message-Id: <1476221058-10431-1-git-send-email-matt@bubblegen.co.uk><br>>> X-Mailer: git-send-email 2.4.10<br>>><br>>> If an encrypted multipart message is received which contains html and<br>>> notmuch-multipart/alternative-discouraged is set to discourage "text/plain",<br>>> any encrypted parts are not decrypted during generation of the reply<br>>> text. This fixes that problem by making sure notmuch-mua-reply does<br>>> that.<br>><br>> Hi<br>><br>> I haven't tested this but it looks correct: more broadly I think this is<br>> needed whenever notmuch-show has to get a part directly rather than just<br>> from the sexp reply.<br><br>Hi<br><br>Just to confirm I have now tested this -- it compiles and test suite<br>passes. (Note I don't have suitable encrypted messages to test).<br><br>Anyway LGTM +1<br><br>Best wishes<br><br>Mark<br><br><br><br>><br>> Best wishes<br>><br>> Mark<br>><br>><br>>> ---<br>>> emacs/notmuch-mua.el | 4 ++++<br>>> 1 file changed, 4 insertions(+)<br>>><br>>> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el<br>>> index c567173..f333655 100644<br>>> --- a/emacs/notmuch-mua.el<br>>> +++ b/emacs/notmuch-mua.el<br>>> @@ -251,6 +251,10 @@ mutiple parts get a header."<br>>> (notmuch-show-max-text-part-size 0)<br>>> ;; Insert headers for parts as appropriate for replying.<br>>> (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)<br>>> + ;; Ensure that any encrypted parts are<br>>> + ;; decrypted during the generation of the reply<br>>> + ;; text.<br>>> + (notmuch-show-process-crypto process-crypto)<br>>> ;; Don't indent multipart sub-parts.<br>>> (notmuch-show-indent-multipart nil))<br>>> ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).<br>>> -- <br>>> 2.4.10<br>>><br>>> _______________________________________________<br>>> notmuch mailing list<br>>> notmuch@notmuchmail.org<br>>> https://notmuchmail.org/mailman/listinfo/notmuch<br></body></html>