--- /dev/null
+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 985B76DE1AC9\r
+ for <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:26 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.246\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.246 tagged_above=-999 required=5 tests=[AWL=0.324,\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 b5tEXwp5bzlt for <notmuch@notmuchmail.org>;\r
+ Sun, 14 Feb 2016 10:40:24 -0800 (PST)\r
+Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com\r
+ [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 5AA0B6DE178F for\r
+ <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:21 -0800 (PST)\r
+Received: by mail-wm0-f66.google.com with SMTP id c200so12198355wme.0\r
+ for <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:21 -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=kFeY4ZGuadODd7xi/GwwU2A3lRHUI5qALY2L6Gt+GLQ=;\r
+ b=A/kq1aZ8yeBCqFh+tYYeP8nfekfLYz0NQIhstIfA8hX6E+9s51bkJypjPi7+At0f8b\r
+ NWPwmpkhF3D+upRij9gf+Q1s1es1MgFmPybiWQhp9V7CSo0PWM4sN+q/gqg6y0ihfiXO\r
+ jjGBRnzqQkKDxYAQChsqSt3EqYpm0jzM+hm1NvJ6LqZ3nOT9OmB1C84X2078ZQPWeKc4\r
+ +pyBLCSfdTbCm7JtztiyJw6mej16VjpPMaw59j7J3/z3szHIHJrHE1bYtWQUaCsUvQm9\r
+ G4yLJCI0VeK3oHNigFmNZe3gJIBfeW5pHyAVC2qIRh0qolq8hQLMg0rd1D46Aluc2ZQH\r
+ vRKg==\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:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=kFeY4ZGuadODd7xi/GwwU2A3lRHUI5qALY2L6Gt+GLQ=;\r
+ b=OmVZCBJuPl1VcWLFzQzBmHEJCJMA8CKnnQ4JmzrBozdY9pXiVJyzmSkjCQDaVMU0b6\r
+ 5Y89uiNHJjsROoFU/8huQ6jSL9d7h/m4+rg8+74pTG2N19JjrULTNmz5n2iLEv79TBve\r
+ WBPVCeD35qqoc+XooYrf0g8HWa3S24Bl+MdRVURvf5931cpLvqmo5RHhOgwc8dp3uSNy\r
+ h3VADjb3OwHO2Hm5Sv24qXZRmA1LFU5Qu2pLP3hz8Us5ASvK0PjMgLt+Q+tQ338fYpPf\r
+ lNdc3aufuDY/ZipcS0X1vdrcy09fJsqwyfFSs6yYX97o1RcmzUCNiCU+sEgHLzqVGhAV\r
+ 65jw==\r
+X-Gm-Message-State:\r
+ AG10YORIty2zY/7tdelPMQnMUMuy2HD6vrkNiChAst+vUjYYQ0ePYPljnzgvEUWrLmkveQ==\r
+X-Received: by 10.28.221.68 with SMTP id u65mr8852256wmg.95.1455475220083;\r
+ Sun, 14 Feb 2016 10:40:20 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id v66sm12004978wmb.18.2016.02.14.10.40.19\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sun, 14 Feb 2016 10:40:19 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 4/7] emacs/show: Remove the 'no-buttons option of\r
+ `notmuch-show-insert-bodypart'\r
+Date: Sun, 14 Feb 2016 18:39:56 +0000\r
+Message-Id: <1455475199-32622-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1455475199-32622-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: Sun, 14 Feb 2016 18:40:26 -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 | 12 +++---------\r
+ 1 file changed, 3 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 37ed74d..f0bbff0 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -955,9 +955,7 @@ will return nil if the CID is unknown or cannot be retrieved."\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
+@@ -966,14 +964,10 @@ useful for quoting in replies)."\r
+ (> notmuch-show-max-text-part-size 0)\r
+ (> (length (plist-get part :content)) notmuch-show-max-text-part-size)))\r
+ (beg (point))\r
+- ;; We show the part button if notmuch-show-insert-header-p\r
+- ;; says to, unless 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
+- ;; uses 'no-buttons automatically includes long parts)\r
++ ;; and we have a button to allow toggling.\r
+ (show-part (not (or (equal hide t)\r
+ (and long button))))\r
+ (content-beg (point)))\r
+-- \r
+2.1.4\r
+\r
projects / notmuch-archives.git / commitdiff