From: David Bremner <david@tethera.net>
Date: Tue, 12 Sep 2017 01:32:00 +0000 (-0300)
Subject: Merge tag '0.25.1'
X-Git-Tag: 0.26_rc0~149
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=43668950626f347f05aad7d49cd9ea4383030443;hp=3445385f95c4e28312466f07d25c51c2b7273d3e

Merge tag '0.25.1'

notmuch 0.25.1 release (bugfix for emacs bug 28350)
---

diff --git a/NEWS b/NEWS
index a2498d1a..3c8198d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Notmuch 0.25.1 (2017-09-11)
+===========================
+
+Emacs
+-----
+
+Disable handling x-display in text/enriched messages. Mitigation for
+Emacs bug #28350.
+
 Notmuch 0.25 (2017-07-25)
 =========================
 
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 62dd1f19..afd59190 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.25'
+__VERSION__ = '0.25.1'
 SOVERSION = '5'
diff --git a/debian/changelog b/debian/changelog
index c4b0ca8c..d67d84f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-notmuch (0.25-7) UNRELEASED; urgency=medium
+notmuch (0.25.1-1) unstable; urgency=medium
 
+  * new upstream bugfix release: mitigation for emacs bug 28350
   * remove obsolete lintian override
   * reformat debian/NEWS
 
- -- David Bremner <bremner@debian.org>  Wed, 16 Aug 2017 21:35:44 -0300
+ -- David Bremner <bremner@debian.org>  Mon, 11 Sep 2017 22:20:48 -0300
 
 notmuch (0.25-6) unstable; urgency=medium
 
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index cd901e47..99390277 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.
diff --git a/version b/version
index 7d385d41..af2dabf3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.25
+0.25.1