[PATCH v4 4/7] emacs/show: Remove the 'no-buttons option of `notmuch-show-insert...

diff --git a/6b/e0e60da8ae21cf9decbed06342426e305b7e9e b/6b/e0e60da8ae21cf9decbed06342426e305b7e9e
new file mode 100644 (file)
index 0000000..4e8cf62
--- /dev/null
+++ b/6b/e0e60da8ae21cf9decbed06342426e305b7e9e
@@ -0,0 +1,99 @@
+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 arlo.cworth.org (Postfix) with ESMTP id 3FD986DE1744\r
+ for <notmuch@notmuchmail.org>; Sat,  7 Nov 2015 03:05:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.145\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.145 tagged_above=-999 required=5 tests=[AWL=0.425,\r
+  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id AIEEqRYGe3iu for <notmuch@notmuchmail.org>;\r
+ Sat,  7 Nov 2015 03:05:03 -0800 (PST)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+ [209.85.212.179])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 8A0126DE1916\r
+ for <notmuch@notmuchmail.org>; Sat,  7 Nov 2015 03:04:51 -0800 (PST)\r
+Received: by wikq8 with SMTP id q8so43978314wik.1\r
+ for <notmuch@notmuchmail.org>; Sat, 07 Nov 2015 03:04:50 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=JENGZov6KU97kg39mFI3k+XMtL72CPFJ5HLoSW6v6u8=;\r
+ b=IcIpx8BYY0z97ccF+QTJ5bDhbw1EEiaOeBklYbuO5uGXlYsxtABbpAwwC6DSWHCTmy\r
+ a/icgGFA827x/9ICZ5mrh4mO10cfqnsBoJnkRvq1/zakY4y824ecRj5Cc13yOWmRteBS\r
+ Kvs0dZUYKcB+nkDwjRYUYSLXVa2bGl4LDe72STAttI3kkMQpxmg9INyOPZnPdRMbuUSi\r
+ qGDqCfjZ1t33Co78S1fPvNlOERj2DZpjE0dn1qZWF7/IfYnZ3aSCNiY9zdelYbcmy+2e\r
+ BtSqr3QKVN9lAlujxTsl8gx4xJFfzyR+t+x8j5UyN+lM+2VxZlTgIkLvkOE2iSTJujgX\r
+ pKiQ==\r
+X-Received: by 10.194.105.38 with SMTP id gj6mr18731440wjb.130.1446894290017; \r
+ Sat, 07 Nov 2015 03:04:50 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id vr10sm4538429wjc.38.2015.11.07.03.04.48\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 07 Nov 2015 03:04:49 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 4/7] emacs/show: Remove the 'no-buttons option of\r
+ `notmuch-show-insert-bodypart'\r
+Date: Sat,  7 Nov 2015 11:04:33 +0000\r
+Message-Id: <1446894276-7814-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 07 Nov 2015 11:05:05 -0000\r
+\r
+From: David Edmondson <dme@dme.org>\r
+\r
+No code uses the 'no-buttons argument to\r
+`notmuch-show-insert-bodypart', so remove it.\r
+---\r
+ emacs/notmuch-show.el | 7 ++-----\r
+ 1 file changed, 2 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 9fc79e0..f8184e2 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -956,9 +956,7 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\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
+@@ -969,8 +967,7 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\r
+        (beg (point))\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
+-                          (notmuch-show-insert-header-p part hide))\r
++       (button (when (notmuch-show-insert-header-p part hide)\r
+                  (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))\r
+        ;; Hide the part initially if HIDE is t, or if it is too long\r
+        ;; and we have a button to allow toggling (thus reply which\r
+-- \r
+2.1.4\r
+\r