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

diff --git a/3b/a5a24d8b520116259a9209cf28ee2c1d7285c1 b/3b/a5a24d8b520116259a9209cf28ee2c1d7285c1
new file mode 100644 (file)
index 0000000..982536a
--- /dev/null
+++ b/3b/a5a24d8b520116259a9209cf28ee2c1d7285c1
@@ -0,0 +1,106 @@
+Return-Path: <dme@dme.org>\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 6F06C431FC7\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:53 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 Bwouvi6p8XYg for <notmuch@notmuchmail.org>;\r
+       Mon, 12 May 2014 05:29:48 -0700 (PDT)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+       [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4C0EE431FD7\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:35 -0700 (PDT)\r
+Received: by mail-wi0-f169.google.com with SMTP id hi2so5399668wib.4\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:34 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+       :references;\r
+       bh=j74C5hxW23VCV3iLul5RdI1LR6BNZMuIl6UJEQtcSZ8=;\r
+       b=COlfY3UF7ikwDQu6dbb2a70yTb5nd5w/ncB/8N3vp3wkpe4GjjwnXYRt03cMYae+pY\r
+       GfEHNNzRpjYGKH2VRBob4Da21UKk9CAvK8hqdZhvVItoHMzUKU3tvZE43184kNX24kW8\r
+       NPAXFapQN103Btmw6U0UadkDGZBUOM0sWcIARjB63QJEazC1O2duYLq+tBw2nUjzPKQj\r
+       FmcH0bX2a0RkJ8KC5BQybTZ/apCUVElO/LR1l+U/LdSXpsTmKdNFbXyzX9k3qMX1zEUV\r
+       mKBZhXlO0Mti3NPTfB+xZK5CdtAxifqLBeT2DrO16wDuzCHvLx58Qj9cUiztHfqp3ypo\r
+       H6YQ==\r
+X-Gm-Message-State:\r
+ ALoCoQmKlTFHh+mSRgctyy9h5uwU2RNtZS0NWmMpYIudM49Irul7PhX3emrLpAgktQ71ckhxJ23N\r
+X-Received: by 10.194.71.66 with SMTP id s2mr3346491wju.23.1399897774111;\r
+       Mon, 12 May 2014 05:29:34 -0700 (PDT)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       ([2a01:348:1a2:1:a288:b4ff:fe8a:77d8])\r
+       by mx.google.com with ESMTPSA id c7sm17753850wjf.19.2014.05.12.05.29.32\r
+       for <notmuch@notmuchmail.org>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Mon, 12 May 2014 05:29:32 -0700 (PDT)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 4223B10B32A; Mon, 12 May 2014 13:29:29 +0100 (BST)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 5/9] emacs/show: Remove the 'no-buttons option of\r
+       `notmuch-show-insert-bodypart'\r
+Date: Mon, 12 May 2014 13:29:25 +0100\r
+Message-Id: <1399897769-26809-6-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.0.0.rc0\r
+In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+       <1399897769-26809-1-git-send-email-dme@dme.org>\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 12:29:53 -0000\r
+\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
+        ;; 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