unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
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	[thread overview]
Message-ID: <1455992680-24978-6-git-send-email-markwalters1009@gmail.com> (raw)
In-Reply-To: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>

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

  parent reply	other threads:[~2016-02-20 18:25 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-20 18:24 [PATCH v6 0/6] emacs: Improve the cited message included in replies Mark Walters
2016-02-20 18:24 ` [PATCH v6 1/6] emacs/show: Re-arrange determination if a part header is necessary Mark Walters
2016-02-20 18:24 ` [PATCH v6 2/6] emacs/show: Make the insertion of part headers overridable Mark Walters
2016-02-20 18:24 ` [PATCH v6 3/6] emacs/show: Accommodate the lack of part header buttons Mark Walters
2016-02-20 18:24 ` [PATCH v6 4/6] emacs/mua: Generate improved cited text for replies Mark Walters
2016-03-07 17:52   ` Jani Nikula
2016-03-07 18:10     ` David Edmondson
2016-03-07 18:25       ` Jani Nikula
2016-03-07 18:49         ` David Edmondson
2016-03-07 19:26           ` Mark Walters
2016-02-20 18:24 ` Mark Walters [this message]
2016-02-20 18:24 ` [PATCH v6 6/6] emacs/mua: Let user specify which parts get a header in citations Mark Walters
2016-03-07 17:17   ` Jani Nikula
2016-03-07 17:27     ` David Edmondson
2016-03-07 19:14       ` Mark Walters
2016-03-07 19:16       ` Jani Nikula
2016-02-22 11:57 ` [PATCH v6 0/6] emacs: Improve the cited message included in replies David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455992680-24978-6-git-send-email-markwalters1009@gmail.com \
    --to=markwalters1009@gmail.com \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).