]> git.notmuchmail.org Git - notmuch/commitdiff
Fix reply to encrypted mail when discouraging plain text.
authorMatthew Lear <matt@bubblegen.co.uk>
Tue, 11 Oct 2016 21:24:30 +0000 (22:24 +0100)
committerDavid Bremner <david@tethera.net>
Mon, 17 Oct 2016 11:55:04 +0000 (08:55 -0300)
If an encrypted multipart message is received which contains html and
notmuch-multipart/alternative-discouraged is set to discourage "text/plain",
any encrypted parts are not decrypted during generation of the reply
text. This fixes that problem by making sure notmuch-mua-reply does
that.

emacs/notmuch-mua.el

index c56717314a6ef3d8e576f69b48cbeaa5171aef33..f3336559a87a47fb8999b6afcf33005405be1466 100644 (file)
@@ -251,6 +251,10 @@ mutiple parts get a header."
                       (notmuch-show-max-text-part-size 0)
                       ;; Insert headers for parts as appropriate for replying.
                       (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
+                      ;; Ensure that any encrypted parts are
+                      ;; decrypted during the generation of the reply
+                      ;; text.
+                      (notmuch-show-process-crypto process-crypto)
                       ;; Don't indent multipart sub-parts.
                       (notmuch-show-indent-multipart nil))
                    ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).