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=-c

Merge tag '0.25.1'

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

43668950626f347f05aad7d49cd9ea4383030443
diff --combined emacs/notmuch-show.el
index cd901e47,dd423765..99390277
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@@ -773,6 -773,15 +773,15 @@@ will return nil if the CID is unknown o
  (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.
@@@ -1260,9 -1269,7 +1269,9 @@@ matched.
      ;; aren't wiped out.
      (setq notmuch-show-thread-id thread-id
  	  notmuch-show-parent-buffer parent-buffer
 -	  notmuch-show-query-context query-context
 +	  notmuch-show-query-context (if (or (string= query-context "")
 +					     (string= query-context "*"))
 +					 nil query-context)
  
  	  notmuch-show-process-crypto notmuch-crypto-process-mime
  	  ;; If `elide-toggle', invert the default value.