Re: [PATCH v3 5/9] emacs/show: Remove the 'no-buttons option of `notmuch-show-insert...

diff --git a/1d/e6b5e0b958d799da3c4531b75d45d3e2c186cb b/1d/e6b5e0b958d799da3c4531b75d45d3e2c186cb
new file mode 100644 (file)
index 0000000..7597757
--- /dev/null
+++ b/1d/e6b5e0b958d799da3c4531b75d45d3e2c186cb
@@ -0,0 +1,116 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1ADFF431FC2\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:18:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id EmHcPX3ikwcc for <notmuch@notmuchmail.org>;\r
+       Mon, 12 May 2014 15:18:33 -0700 (PDT)\r
+Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com\r
+       [209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9368A431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:18:33 -0700 (PDT)\r
+Received: by mail-wi0-f180.google.com with SMTP id hi2so5304364wib.1\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:18:32 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type;\r
+       bh=6A6OTx7djqhJ/kVwXJ/HVfQImNrTkqpToAi0Bu00olY=;\r
+       b=Op+7NskID5EKT/1M2FzF74cvsPUZtUUg6UvGypL5pGjv35mjZY60lOrKJ3rn3HtdlJ\r
+       kg1MR+TOUq8vlkptDxVy0ig1SRfeEZQP5al0nwjviDyazzHVJE1L7a3U7smiPdWijI0A\r
+       I7mucKs8mqgg2bY9qOJ1tORkAstmxPXiNLpfDF6srkL8YzcOyQrzkMPEOR2Xc2o/wHHk\r
+       Pipo2C4pHvjRCIPMa3w89eMRnE4Gvud6uHErMFw6qhrz1yJR7EToQpzFBvdqO4ba3Y5g\r
+       lQUAW6CI7JulDtQbrxeYfusg+SVKfFx6xmzQZ+B5T2fvqHBkK2H2NmaWyz6iQTLK9PRJ\r
+       mmXw==\r
+X-Received: by 10.180.198.48 with SMTP id iz16mr17804746wic.29.1399933112434; \r
+       Mon, 12 May 2014 15:18:32 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+       by mx.google.com with ESMTPSA id\r
+       dn4sm18384696wib.18.2014.05.12.15.18.31 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Mon, 12 May 2014 15:18:31 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 5/9] emacs/show: Remove the 'no-buttons option of\r
+       `notmuch-show-insert-bodypart'\r
+In-Reply-To: <1399897769-26809-6-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+       <1399897769-26809-1-git-send-email-dme@dme.org>\r
+       <1399897769-26809-6-git-send-email-dme@dme.org>\r
+User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 12 May 2014 23:18:29 +0100\r
+Message-ID: <87k39qk5e2.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 12 May 2014 22:18:41 -0000\r
+\r
+On Mon, 12 May 2014, David Edmondson <dme@dme.org> wrote:\r
+> No code uses the 'no-buttons argument to\r
+> `notmuch-show-insert-bodypart', so remove it.\r
+> ---\r
+>  emacs/notmuch-show.el | 9 +++------\r
+>  1 file changed, 3 insertions(+), 6 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index e511655..981b922 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -915,9 +915,7 @@ message at DEPTH in the current thread."\r
+>  \r
+>  HIDE determines whether to show or hide the part and the button\r
+>  as follows: If HIDE is nil, show the part and the button. If HIDE\r
+> -is t, hide the part initially and show the button. If HIDE is\r
+> -'no-buttons, show the part but do not add any buttons (this is\r
+> -useful for quoting in replies)."\r
+> +is t, hide the part initially and show the button."\r
+>  \r
+>    (let* ((content-type (downcase (plist-get part :content-type)))\r
+>       (mime-type (notmuch-show-mime-type part))\r
+> @@ -926,9 +924,8 @@ useful for quoting in replies)."\r
+>       ;; Hide the part initially if HIDE is t.\r
+>       (show-part (not (equal hide t)))\r
+\r
+Just a triviality: we might as well make the above (not hide) now.\r
+\r
+MW\r
+\r
+>       ;; We omit the part button for the first (or only) part if\r
+> -     ;; this is text/plain, or HIDE is 'no-buttons.\r
+> -     (button (when (and (not (equal hide 'no-buttons))\r
+> -                        (funcall notmuch-show-insert-header-p-function part))\r
+> +     ;; this is text/plain.\r
+> +     (button (when (funcall notmuch-show-insert-header-p-function part)\r
+>                 (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))\r
+>       (content-beg (point)))\r
+>  \r
+> -- \r
+> 2.0.0.rc0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r