diff options
| author | David Bremner <david@tethera.net> | 2017-09-11 22:32:00 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-09-11 22:32:00 -0300 |
| commit | 43668950626f347f05aad7d49cd9ea4383030443 (patch) | |
| tree | 760d7f507ff2a562ba215317d2a90a2bcca0c631 | |
| parent | 3445385f95c4e28312466f07d25c51c2b7273d3e (diff) | |
| parent | 949c27144e0b9294267511993a109c29d319a23d (diff) | |
Merge tag '0.25.1'
notmuch 0.25.1 release (bugfix for emacs bug 28350)
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | bindings/python/notmuch/version.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | emacs/notmuch-show.el | 9 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 23 insertions, 4 deletions
@@ -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. @@ -1 +1 @@ -0.25 +0.25.1 |