[PATCH] emacs: override enriched-decode-display-prop for text/enriched display

[PATCH] emacs: override enriched-decode-display-prop for text/enriched display

[Jani Nikula]

Switch to a local version of enriched-decode-display-prop if we
encounter a text/enriched part. This is to mitigate
https://bugs.gnu.org/28350. Normally it would be prudent to remove the
override afterwards, but in this case just leave it in.
---
 emacs/notmuch-show.el | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index cd901e471930..993902770095 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -773,6 +773,15 @@ will return nil if the CID is unknown or cannot be retrieved."
 (defun notmuch-show-insert-part-text/x-vcalendar (msg part content-type nth depth button)
   (notmuch-show-insert-part-text/calendar msg part content-type nth depth button))
 
+;; https://bugs.gnu.org/28350
+(defun notmuch-show--enriched-decode-display-prop (start end &optional param)
+  (list start end))
+
+(defun notmuch-show-insert-part-text/enriched (msg part content-type nth depth button)
+  (advice-add 'enriched-decode-display-prop :override
+	      #'notmuch-show--enriched-decode-display-prop)
+  nil)
+
 (defun notmuch-show-get-mime-type-of-application/octet-stream (part)
   ;; If we can deduce a MIME type from the filename of the attachment,
   ;; we return that.
-- 
2.11.0

Re: [PATCH] emacs: override enriched-decode-display-prop for text/enriched display

[David Edmondson]

Looks good.

On Monday, 2017-09-11 at 23:09:49 +0300, Jani Nikula wrote:

> Switch to a local version of enriched-decode-display-prop if we
> encounter a text/enriched part. This is to mitigate
> https://bugs.gnu.org/28350. Normally it would be prudent to remove the
> override afterwards, but in this case just leave it in.
> ---
>  emacs/notmuch-show.el | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> index cd901e471930..993902770095 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -773,6 +773,15 @@ will return nil if the CID is unknown or cannot be retrieved."
>  (defun notmuch-show-insert-part-text/x-vcalendar (msg part content-type nth depth button)
>    (notmuch-show-insert-part-text/calendar msg part content-type nth depth button))
>  
> +;; https://bugs.gnu.org/28350
> +(defun notmuch-show--enriched-decode-display-prop (start end &optional param)
> +  (list start end))
> +
> +(defun notmuch-show-insert-part-text/enriched (msg part content-type nth depth button)
> +  (advice-add 'enriched-decode-display-prop :override
> +	      #'notmuch-show--enriched-decode-display-prop)
> +  nil)
> +
>  (defun notmuch-show-get-mime-type-of-application/octet-stream (part)
>    ;; If we can deduce a MIME type from the filename of the attachment,
>    ;; we return that.
> -- 
> 2.11.0
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch

dme.
-- 
There's too many people on the bus from the airport.

notmuch release 0.25.1 now available

[David Bremner]

Where to obtain notmuch 0.25.1
===========================
  https://notmuchmail.org/releases/notmuch-0.25.1.tar.gz

Which can be verified with:

  https://notmuchmail.org/releases/notmuch-0.25.1.tar.gz.sha256
  b4bf09ec9b7b64180704faa26d66cad5f911a5a00ef812da34cb02c3f8872831  notmuch-0.25.1.tar.gz

  https://notmuchmail.org/releases/notmuch-0.25.1.tar.gz.sha256.asc
  (signed by David Bremner)

What's new in notmuch 0.25.1
=========================

Emacs
-----

Disable handling x-display in text/enriched messages. Mitigation for
Emacs bug #28350.

What is notmuch
===============
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
the Xapian library to provide fast, full-text search with a convenient
search syntax.

For more about notmuch, see https://notmuchmail.org