[PATCH v6 5/6] emacs/show: Remove the 'no-buttons option of `notmuch-show-insert-bodypart'

Subject: [PATCH v6 5/6] emacs/show: Remove the 'no-buttons option of `notmuch-show-insert-bodypart'

Date: Sat, 20 Feb 2016 18:24:39 +0000

To: notmuch@notmuchmail.org

Cc:

From: Mark Walters


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 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 8222f0d..2a81ec1 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -959,9 +959,7 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)
 
 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))
@@ -972,12 +970,10 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)
 	 (beg (point))
 	 ;; This default header-p function omits the part button for
 	 ;; the first (or only) part if this is text/plain.
-	 (button (when (and (not (equal hide 'no-buttons))
-		     (funcall notmuch-show-insert-header-p-function part hide))
+	 (button (when (funcall notmuch-show-insert-header-p-function 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


Thread: