From: David Edmondson <dme@dme.org> No code uses the 'no-buttons argument to `notmuch-show-insert-bodypart', so remove it. --- emacs/notmuch-show.el | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 37ed74d..f0bbff0 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -955,9 +955,7 @@ will return nil if the CID is unknown or cannot be retrieved." HIDE determines whether to show or hide the part and the button as follows: If HIDE is nil, show the part and the button. If HIDE -is t, hide the part initially and show the button. If HIDE is -'no-buttons, show the part but do not add any buttons (this is -useful for quoting in replies)." +is t, hide the part initially and show the button." (let* ((content-type (downcase (plist-get part :content-type))) (mime-type (notmuch-show-mime-type part)) @@ -966,14 +964,10 @@ useful for quoting in replies)." (> notmuch-show-max-text-part-size 0) (> (length (plist-get part :content)) notmuch-show-max-text-part-size))) (beg (point)) - ;; We show the part button if notmuch-show-insert-header-p - ;; says to, unless HIDE is 'no-buttons. - (button (when (and (not (equal hide 'no-buttons)) - (notmuch-show-insert-header-p part hide)) + (button (when (notmuch-show-insert-header-p part hide) (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 - ;; and we have a button to allow toggling (thus reply which - ;; uses 'no-buttons automatically includes long parts) + ;; and we have a button to allow toggling. (show-part (not (or (equal hide t) (and long button)))) (content-beg (point))) -- 2.1.4