Merge tag '0.25.1'

notmuch 0.25.1 release (bugfix for emacs bug 28350)

diff --combined emacs/notmuch-show.el
index cd901e47193058429a842bd8b4260e9da18e8e0c,dd423765d7139cc2004c5a3b03c6989cdca57ff1..9939027700952c0f5255700cc9be5a274ae4f99b
--- 1/emacs/notmuch-show.el
--- 2/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.