Merge branch 'release'

[notmuch] / emacs / notmuch-wash.el

diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index 826b6f43c77ba6853a32f65ad82b67af0a52271c..8a68819cc9940be440871622cbfda237f6749962 100644 (file)
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -23,7 +23,7 @@
 
 (require 'coolj)
 
-(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth))
+(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))
 
 ;;
 
@@ -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