From: Jani Nikula <jani@nikula.org>
Date: Mon, 11 Sep 2017 20:09:49 +0000 (+0300)
Subject: emacs: override enriched-decode-display-prop for text/enriched display
X-Git-Tag: 0.25.1~3
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=9b0582383833c323b0b902dbe21ecf9cb0cce628

emacs: override enriched-decode-display-prop for text/enriched display

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.

Notes from db:
      This doesn't disable text/enriched, just one feature of it.
---

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 1cbcc132..dd423765 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.