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: Re-arrange determination if a part header is necessary

Browse source 
Move the determination of whether a part header is required to a
distinct function.
This commit is contained in:
David Edmondson 2016-02-20 18:24:35 +00:00 committed by David Bremner
parent c689d1ff13
commit 65a2a58a81
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
emacs/notmuch-show.el
View file

@ -921,6 +921,22 @@ will return nil if the CID is unknown or cannot be retrieved."
;; showable this returns nil. ;; showable this returns nil.
(notmuch-show-create-part-overlays button part-beg part-end)))) (notmuch-show-create-part-overlays button part-beg part-end))))
(defun notmuch-show-mime-type (part)
"Return the correct mime-type to use for PART."
(let ((content-type (downcase (plist-get part :content-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)))
(defun notmuch-show-insert-header-p (part hide)
"Return non-NIL if a header button should be inserted for this part."
;; Show all part buttons except for the first part if it is text/plain.
(let ((mime-type (notmuch-show-mime-type part)))
(not (and (string= mime-type "text/plain")
(<= (plist-get part :id) 1)))))
(defun notmuch-show-insert-bodypart (msg part depth &optional hide) (defun notmuch-show-insert-bodypart (msg part depth &optional hide)
"Insert the body part PART at depth DEPTH in the current thread. "Insert the body part PART at depth DEPTH in the current thread.
@ -931,20 +947,16 @@ is t, hide the part initially and show the button. If HIDE is
useful for quoting in replies)." useful for quoting in replies)."
(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 (notmuch-show-mime-type part))
(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)) (nth (plist-get part :id))
(long (and (notmuch-match-content-type mime-type "text/*") (long (and (notmuch-match-content-type mime-type "text/*")
(> notmuch-show-max-text-part-size 0) (> notmuch-show-max-text-part-size 0)
(> (length (plist-get part :content)) notmuch-show-max-text-part-size))) (> (length (plist-get part :content)) notmuch-show-max-text-part-size)))
(beg (point)) (beg (point))
;; We omit the part button for the first (or only) part if ;; We show the part button if notmuch-show-insert-header-p
;; this is text/plain, or HIDE is 'no-buttons. ;; says to, unless HIDE is 'no-buttons.
(button (unless (or (equal hide 'no-buttons) (button (when (and (not (equal hide 'no-buttons))
(and (string= mime-type "text/plain") (<= nth 1))) (notmuch-show-insert-header-p part hide))
(notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename)))) (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))
;; Hide the part initially if HIDE is t, or if it is too long ;; Hide the part initially if HIDE is t, or if it is too long
;; and we have a button to allow toggling (thus reply which ;; and we have a button to allow toggling (thus reply which