Merge tag '0.25.1'

notmuch 0.25.1 release (bugfix for emacs bug 28350)

diff --git a/NEWS b/NEWS
index a2498d1a765755a7af97ab1df9f223045e95c654..3c8198d3ef127a432e22d3dcf836991e1576ffff 100644 (file)
--- 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 62dd1f1923683353a7f7d6417dd7ce1b55d96fd1..afd591907aae6287e911fc57c2131e370a05afb1 100644 (file)
--- 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 c4b0ca8cd12e2bdb0f01dac3535c181d70094298..d67d84f1073c1eff8e41525fcfa870b7cc86c748 100644 (file)
--- 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 cd901e47193058429a842bd8b4260e9da18e8e0c..9939027700952c0f5255700cc9be5a274ae4f99b 100644 (file)
--- 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 7d385d419cc848ee6394256288edbcd8f4f7522a..af2dabf3ff68ad99a0f3bf238bedfa12267a2944 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.25
+0.25.1