emacs: show: handle inline patch fake parts at top level

The inline patch fake part handler also modifies the content-type so
handle this in notmuch-show-insert-bodypart too.

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 652e5dc3c949acb705586dafec273bdc92b0e8b6..d56154eb2359515910a8fe942123e7acfd728693 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -815,7 +815,7 @@ message at DEPTH in the current thread."
 
 ;; Handler for wash generated inline patch fake parts.
 (defun notmuch-show-insert-part-inline-patch-fake-part (msg part content-type nth depth declared-type)
-  (notmuch-show-insert-part-*/* msg part "text/x-diff" nth depth "inline patch"))
+  (notmuch-show-insert-part-*/* msg part content-type nth depth declared-type))
 
 (defun notmuch-show-insert-part-text/html (msg part content-type nth depth declared-type)
   ;; text/html handler to work around bugs in renderers and our
@@ -889,6 +889,8 @@ If HIDE is non-nil then initially hide this part."
   (let* ((content-type (downcase (plist-get part :content-type)))
         (mime-type (or (and (string= content-type "application/octet-stream")
                             (notmuch-show-get-mime-type-of-application/octet-stream part))
+                       (and (string= content-type "inline patch")
+                            "text/x-diff")
                        content-type))
         (nth (plist-get part :id))
         (beg (point)))

diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index 80c475c6c1b94dbf243c7af875a6b98fc3fd58d5..8a68819cc9940be440871622cbfda237f6749962 100644 (file)
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -365,7 +365,7 @@ for error."
          (setq patch-end (match-beginning 0)))
       (save-restriction
        (narrow-to-region patch-start patch-end)
-       (setq part (plist-put part :content-type "inline-patch-fake-part"))
+       (setq part (plist-put part :content-type "inline patch"))
        (setq part (plist-put part :content (buffer-string)))
        (setq part (plist-put part :id -1))
        (setq part (plist-put part :filename