Re: [PATCH v4 4/7] emacs/show: Remove the 'no-buttons option of `notmuch-show-insert...
authorDavid Edmondson <dme@dme.org>
Tue, 9 Feb 2016 20:31:05 +0000 (20:31 +0000)
committerW. Trevor King <wking@tremily.us>
Sat, 20 Aug 2016 23:21:03 +0000 (16:21 -0700)
52/659c2b42fb4090ea8c69bb97b1e72ae1ebce8e [new file with mode: 0644]

diff --git a/52/659c2b42fb4090ea8c69bb97b1e72ae1ebce8e b/52/659c2b42fb4090ea8c69bb97b1e72ae1ebce8e
new file mode 100644 (file)
index 0000000..cc9d7bc
--- /dev/null
@@ -0,0 +1,120 @@
+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 arlo.cworth.org (Postfix) with ESMTP id 485006DE1765\r
+ for <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 12:31:10 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.083\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.083 tagged_above=-999 required=5\r
+ tests=[AWL=-0.016, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=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 HTMUQsKlIfIw for <notmuch@notmuchmail.org>;\r
+ Tue,  9 Feb 2016 12:31:08 -0800 (PST)\r
+Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com\r
+ [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 10ED16DE1635 for\r
+ <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 12:31:08 -0800 (PST)\r
+Received: by mail-wm0-f67.google.com with SMTP id g62so48966wme.2\r
+ for <notmuch@notmuchmail.org>; Tue, 09 Feb 2016 12:31:07 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=to:subject:in-reply-to:references:from:date:message-id:mime-version\r
+ :content-type; bh=NtIR1h+52vW3r1iPYVOaIofqE7rXZG24yMIACReV7i4=;\r
+ b=I1yXH6ZNhVbRW7ZM+7EUwtjpF7QYGqBYijo7dvUEJyDbE4ojpb/JY+g6lm9JJYoFm5\r
+ So2G2aAX9PSn4ba33wbrCRxxoZENcAyBp1K2fz5SsMc2cZ7StbAmOt0jHBDk8ITxPyHq\r
+ EKaQfoIZ5azAYg2eEXhAolncEQnSPYRwgf21SyCZxh18PvUa3oGRImW3mLvALST0PQFw\r
+ GF3NZJElH3kKKSt2448NsdQfe7avWJixGkclgEd9UICNaFFBZNalamfpdqw0gZiceuE6\r
+ MZ8O0LokkTypqbb84pvsOQbCYUsxBlIQgKp5ToB36Q7QYSjEWSUcA5OFf5fiWPOIp6zC\r
+ d9wg==\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:to:subject:in-reply-to:references:from:date\r
+ :message-id:mime-version:content-type;\r
+ bh=NtIR1h+52vW3r1iPYVOaIofqE7rXZG24yMIACReV7i4=;\r
+ b=cq5XvcvLbqpxMWBNieiYzEhrj/lA+iZd2JtZ7akuvZmUzekWC/Cuz1YD02r+PuMWyk\r
+ 5kuJTXvIm+MDbZlGFVRcBZr4ZKrkxKSBe7uqoLPWRWOmSC7t4bhMfFPHVZh5eTRBzK3z\r
+ c4FEjytiLiG1+M4/sPJM/e/IN9ppgUc+xZRVuuKzu+qSKVN673EpLnModd0RZ03j54QB\r
+ ZnhwPcjQFGtlrk+1ofhjdchx5UG4+bY/bX5/qIbWAhlGnHnk+bZn0s1e1AT3aUB8xC3z\r
+ /ab7OLKTXE+p6J/PH3SfbSTe0qvMKZdwkV4lraG9vDX8GG3gPhNa9wjfGWa4H5jPM9t0\r
+ ilBg==\r
+X-Gm-Message-State:\r
+ AG10YOQM91+Yba6TEIxwfKDE3qJRZy4hCgYQaYnAVnAMVrqAlOy1TVzU0EWLwlskDiFhnw==\r
+X-Received: by 10.28.145.7 with SMTP id t7mr7019661wmd.98.1455049866755;\r
+ Tue, 09 Feb 2016 12:31:06 -0800 (PST)\r
+Received: from disaster-area.hh.sledj.net\r
+ ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+ by smtp.gmail.com with ESMTPSA id g126sm3942653wmf.16.2016.02.09.12.31.05\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 09 Feb 2016 12:31:05 -0800 (PST)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 634294d7;\r
+ Tue, 9 Feb 2016 20:31:05 +0000 (UTC)\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v4 4/7] emacs/show: Remove the 'no-buttons option of\r
+ `notmuch-show-insert-bodypart'\r
+In-Reply-To: <1446894276-7814-5-git-send-email-markwalters1009@gmail.com>\r
+References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+ <1446894276-7814-5-git-send-email-markwalters1009@gmail.com>\r
+From: David Edmondson <dme@dme.org>\r
+Date: Tue, 09 Feb 2016 20:31:05 +0000\r
+Message-ID: <m27fid4ody.fsf@dme.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Tue, 09 Feb 2016 20:31:10 -0000\r
+\r
+On Sat, Nov 07 2015, Mark Walters wrote:\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
+Looks fine.\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