debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
The inline patch fake part handler also modifies the content-type so
handle this in notmuch-show-insert-bodypart too.
This commit is contained in:
Mark Walters 2013-05-04 14:01:15 +01:00 committed by David Bremner
parent b681aa8235
commit c8589e4eb8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emacs/notmuch-show.el
View file

@ -815,7 +815,7 @@ message at DEPTH in the current thread."
;; Handler for wash generated inline patch fake parts. ;; 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) (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) (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 ;; 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))) (let* ((content-type (downcase (plist-get part :content-type)))
(mime-type (or (and (string= content-type "application/octet-stream") (mime-type (or (and (string= content-type "application/octet-stream")
(notmuch-show-get-mime-type-of-application/octet-stream part)) (notmuch-show-get-mime-type-of-application/octet-stream part))
(and (string= content-type "inline patch")
"text/x-diff")
content-type)) content-type))
(nth (plist-get part :id)) (nth (plist-get part :id))
(beg (point))) (beg (point)))

2
emacs/notmuch-wash.el
View file

@ -365,7 +365,7 @@ for error."
(setq patch-end (match-beginning 0))) (setq patch-end (match-beginning 0)))
(save-restriction (save-restriction
(narrow-to-region patch-start patch-end) (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 :content (buffer-string)))
(setq part (plist-put part :id -1)) (setq part (plist-put part :id -1))
(setq part (plist-put part :filename (setq part (plist-put part :filename