--- /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 F348F6DE1401\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:59 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.28\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.28 tagged_above=-999 required=5 tests=[AWL=0.290, \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,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] 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 RTEWGnFP5SJj for <notmuch@notmuchmail.org>;\r
+ Sat, 20 Feb 2016 10:24:58 -0800 (PST)\r
+Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com\r
+ [74.125.82.53]) by arlo.cworth.org (Postfix) with ESMTPS id B4F096DE1579 for\r
+ <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:51 -0800 (PST)\r
+Received: by mail-wm0-f53.google.com with SMTP id g62so119128677wme.1\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:51 -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=FXcGUjAVTxHcvwwxECM4Q8fuScHEKo9nfxsJ/iYw3F8=;\r
+ b=ejigbFROWmI0kRQ4WR+N2FccirYBft4dYJweACKVEbvWugh/NVmaZi+QVsrHLz7SpI\r
+ o2EhcG4uz6/uk7XmxCPEkpSaxzI+mysKGf0+I6SMkz6GyK917KcUgIzyKg/j8CV0IeqO\r
+ LCpU7dFR9zpfDnX3QgFHrEfcdNRtjPgGbuBKiqBpn3SRGyzEtp3OJscTXR9r0J8m2lOW\r
+ jy7FhSqD22l/sQtg4v83cyz9S3JhUrS//aEJNMFOHlu4VQrYTmxxLvNzPhuYyaGqLJ/z\r
+ 60W2gTUTm+OYQ51pSe1hifGZyJP1J1Vo9omBpsb7l6nbHq9wsTVypGshVeUxKck0wvUQ\r
+ uKXw==\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=FXcGUjAVTxHcvwwxECM4Q8fuScHEKo9nfxsJ/iYw3F8=;\r
+ b=ME9PdOHbIIT83djmT6GaS/s70ntIgApinZkE+cf6Z/lFu0srWk1wOXIFWXUwpyLQxt\r
+ GB8eTfjNX3wsxj+WKp9OCCEbudruLQJTnp5u52uuG578C6gvek8LUmjkDaX98GiV4cqs\r
+ nYoQ6wlYE9RCyjmGgvhTmYTriDtCupRYzjC6lhAO4AYeD6Fz1LK8H/lkIcOuB0BJGZXf\r
+ d/qlQkco969pfjHeGD+soMCXxrQM0n6IllutDbGl7o8p7SKJybzJN2Fd33sF1z75gdto\r
+ Y5plrBlxHAb7EhDfj24SoRFaYoPp9G+7IvjblrKMuH9HybPP4pmu9aZOtQE1VSo4gRPI\r
+ RlAQ==\r
+X-Gm-Message-State:\r
+ AG10YOSX4yIjHuRhAhnRzcrXF2dKvxi7BARhpsU05s0PI+4O6jfLyweZ4U618g6pre0Gmg==\r
+X-Received: by 10.194.76.161 with SMTP id l1mr19319654wjw.108.1455992690499;\r
+ Sat, 20 Feb 2016 10:24:50 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id u4sm16701886wjz.4.2016.02.20.10.24.49\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 20 Feb 2016 10:24:50 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v6 2/6] emacs/show: Make the insertion of part headers\r
+ overridable.\r
+Date: Sat, 20 Feb 2016 18:24:36 +0000\r
+Message-Id: <1455992680-24978-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1455992680-24978-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, 20 Feb 2016 18:25:00 -0000\r
+\r
+From: David Edmondson <dme@dme.org>\r
+\r
+This allows callers of notmuch-show-insert-bodypart to use a `let'\r
+binding to override the default function for specifying when part\r
+headers should be inserted.\r
+\r
+We also add an option to never show part buttons which will be used by\r
+the test suites for the reply tests.\r
+---\r
+ emacs/notmuch-show.el | 18 ++++++++++++++----\r
+ 1 file changed, 14 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 9d9c89f..ddb9c65 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -930,13 +930,23 @@ (defun notmuch-show-mime-type (part)\r
+ "text/x-diff")\r
+ content-type)))\r
+ \r
++;; The following variable can be overridden by let bindings.\r
++(defvar notmuch-show-insert-header-p-function 'notmuch-show-insert-header-p\r
++ "Specify which function decides which part headers get inserted.\r
++\r
++The function should take two parameters, PART and HIDE, and\r
++should return non-NIL if a header button should be inserted for\r
++this part.")\r
++\r
+ (defun notmuch-show-insert-header-p (part hide)\r
+- "Return non-NIL if a header button should be inserted for this part."\r
+ ;; Show all part buttons except for the first part if it is text/plain.\r
+ (let ((mime-type (notmuch-show-mime-type part)))\r
+ (not (and (string= mime-type "text/plain")\r
+ (<= (plist-get part :id) 1)))))\r
+ \r
++(defun notmuch-show-reply-insert-header-p-never (part hide)\r
++ nil)\r
++\r
+ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\r
+ "Insert the body part PART at depth DEPTH in the current thread.\r
+ \r
+@@ -953,10 +963,10 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\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
++ ;; This default header-p function omits the part button for\r
++ ;; the first (or only) part if this is text/plain.\r
+ (button (when (and (not (equal hide 'no-buttons))\r
+- (notmuch-show-insert-header-p part hide))\r
++ (funcall notmuch-show-insert-header-p-function 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
projects / notmuch-archives.git / commitdiff