[PATCH 1/2] test/emacs: add known broken test for inlining on refresh.

[PATCH 1/2] test/emacs: add known broken test for inlining on refresh.

[David Bremner]

This duplicates the bug reported by Al [1]

[1]: id:877d41nmr1.fsf@gmail.com
---
 test/T450-emacs-show.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index 37940c96..b77f8c0e 100755
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -338,6 +338,28 @@ when we detect the word "attachment" and there's no attach? :p
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
+test_begin_subtest "tar not inlined by default on refresh"
+test_subtest_known_broken
+test_emacs '(notmuch-show "id:874llc2bkp.fsf@curie.anarc.at")
+	   (notmuch-show-refresh-view)
+	(test-visible-output "OUTPUT")'
+cat <<EOF > EXPECTED
+Antoine Beaupré <anarcat@orangeseeds.org> (2018-03-19) (attachment inbox)
+Subject: Re: bug: "no top level messages" crash on Zen email loops
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
+Date: Mon, 19 Mar 2018 13:56:54 -0400
+
+[ multipart/mixed ]
+[ text/plain ]
+And obviously I forget the frigging attachment.
+[ zendesk-email-loop2.tgz: application/x-gtar-compressed ]
+[ text/plain ]
+
+PS: don't we have a "you forgot to actually attach the damn file" plugin
+when we detect the word "attachment" and there's no attach? :p
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
 add_email_corpus duplicate
 
 ID3=87r2ecrr6x.fsf@zephyr.silentflame.com
-- 
2.35.2
\r

[PATCH 2/2] emacs/show: restrict inlined mimetypes on refresh.

[David Bremner]

This fixes the bug reported by Al [1]. Essentially apply the same fix
as [2] in a different place.

[1]: id:877d41nmr1.fsf@gmail.com
[2]: 90a7c1af368a527700dcde9b0dcbd760afc7bd92
---
 emacs/notmuch-show.el   | 1 +
 test/T450-emacs-show.sh | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 1bc3b319..c072e81d 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1528,6 +1528,7 @@ non-nil) then the state of the buffer (open/closed messages) is
 reset based on the original query."
   (interactive "P")
   (let ((inhibit-read-only t)
+	(mm-inline-override-types (notmuch--inline-override-types))
 	(state (unless reset-state
 		 (notmuch-show-capture-state))))
     ;; `erase-buffer' does not seem to remove overlays, which can lead
diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index b77f8c0e..e161ee4f 100755
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -339,7 +339,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "tar not inlined by default on refresh"
-test_subtest_known_broken
 test_emacs '(notmuch-show "id:874llc2bkp.fsf@curie.anarc.at")
 	   (notmuch-show-refresh-view)
 	(test-visible-output "OUTPUT")'
-- 
2.35.2

Re: [PATCH 2/2] emacs/show: restrict inlined mimetypes on refresh.

[Tomi Ollila]

On Mon, Aug 01 2022, David Bremner wrote:

> This fixes the bug reported by Al [1]. Essentially apply the same fix
> as [2] in a different place.
>
> [1]: id:877d41nmr1.fsf@gmail.com
> [2]: 90a7c1af368a527700dcde9b0dcbd760afc7bd92

LGTM.

Tomi


> ---
>  emacs/notmuch-show.el   | 1 +
>  test/T450-emacs-show.sh | 1 -
>  2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> index 1bc3b319..c072e81d 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -1528,6 +1528,7 @@ non-nil) then the state of the buffer (open/closed messages) is
>  reset based on the original query."
>    (interactive "P")
>    (let ((inhibit-read-only t)
> +	(mm-inline-override-types (notmuch--inline-override-types))
>  	(state (unless reset-state
>  		 (notmuch-show-capture-state))))
>      ;; `erase-buffer' does not seem to remove overlays, which can lead
> diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
> index b77f8c0e..e161ee4f 100755
> --- a/test/T450-emacs-show.sh
> +++ b/test/T450-emacs-show.sh
> @@ -339,7 +339,6 @@ EOF
>  test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "tar not inlined by default on refresh"
> -test_subtest_known_broken
>  test_emacs '(notmuch-show "id:874llc2bkp.fsf@curie.anarc.at")
>  	   (notmuch-show-refresh-view)
>  	(test-visible-output "OUTPUT")'
> -- 
> 2.35.2
>
> _______________________________________________
> notmuch mailing list -- notmuch@notmuchmail.org
> To unsubscribe send an email to notmuch-leave@notmuchmail.org

Re: [PATCH 2/2] emacs/show: restrict inlined mimetypes on refresh.

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> On Mon, Aug 01 2022, David Bremner wrote:
>
>> This fixes the bug reported by Al [1]. Essentially apply the same fix
>> as [2] in a different place.
>>
>> [1]: id:877d41nmr1.fsf@gmail.com
>> [2]: 90a7c1af368a527700dcde9b0dcbd760afc7bd92
>
> LGTM.
>
> Tomi

Applied to master.

d