emacs/reply: restrict what mime types are inlined by default

Apply the previously factored-out function used by notmuch-show.

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index c679373b175955092858c7bfe8366a4aa088c91e..60801f4be7d331269a578599c00abc2c0cc5c831 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -316,7 +316,9 @@ Typically this is added to `notmuch-mua-send-hook'."
                ;; text.
                (notmuch-show-process-crypto process-crypto)
                ;; Don't indent multipart sub-parts.
-               (notmuch-show-indent-multipart nil))
+               (notmuch-show-indent-multipart nil)
+               ;; Stop certain mime types from being inlined
+               (mm-inline-override-types (notmuch--inline-override-types)))
             ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
             (cl-letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore)
                       ((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore))

diff --git a/test/T453-emacs-reply.sh b/test/T453-emacs-reply.sh
index 5d6c5309095c8c3ed4c97744336093d61ecb8c11..c26c4473019ca8a6d47f3d2191e5157c5a975792 100755 (executable)
--- a/test/T453-emacs-reply.sh
+++ b/test/T453-emacs-reply.sh
@@ -11,7 +11,6 @@ test_require_emacs
 add_email_corpus attachment
 
 test_begin_subtest "tar not inlined by default"
-test_subtest_known_broken
 test_emacs '(notmuch-mua-new-reply "id:874llc2bkp.fsf@curie.anarc.at")
        (test-visible-output "OUTPUT.raw")'
 cat <<EOF > EXPECTED