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

emacs/show: Make the insertion of part headers overridable.

Browse source 
This allows callers of notmuch-show-insert-bodypart to use a `let'
binding to override the default function for specifying when part
headers should be inserted.

We also add an option to never show part buttons which will be used by
the test suites for the reply tests.
This commit is contained in:
David Edmondson 2016-02-20 18:24:36 +00:00 committed by David Bremner
parent 65a2a58a81
commit 92a1f9ba17
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
emacs/notmuch-show.el
View file

@ -930,13 +930,23 @@ will return nil if the CID is unknown or cannot be retrieved."
"text/x-diff") "text/x-diff")
content-type))) content-type)))
;; The following variable can be overridden by let bindings.
(defvar notmuch-show-insert-header-p-function 'notmuch-show-insert-header-p
"Specify which function decides which part headers get inserted.
The function should take two parameters, PART and HIDE, and
should return non-NIL if a header button should be inserted for
this part.")
(defun notmuch-show-insert-header-p (part hide) (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. ;; Show all part buttons except for the first part if it is text/plain.
(let ((mime-type (notmuch-show-mime-type part))) (let ((mime-type (notmuch-show-mime-type part)))
(not (and (string= mime-type "text/plain") (not (and (string= mime-type "text/plain")
(<= (plist-get part :id) 1))))) (<= (plist-get part :id) 1)))))
(defun notmuch-show-reply-insert-header-p-never (part hide)
nil)
(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.
@ -953,10 +963,10 @@ useful for quoting in replies)."
(> 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 show the part button if notmuch-show-insert-header-p ;; This default header-p function omits the part button for
;; says to, unless HIDE is 'no-buttons. ;; the first (or only) part if this is text/plain.
(button (when (and (not (equal hide 'no-buttons)) (button (when (and (not (equal hide 'no-buttons))
(notmuch-show-insert-header-p part hide)) (funcall notmuch-show-insert-header-p-function 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