[PATCH v3 2/9] emacs/show: Allow the user to decide when part headers should be inserted

diff --git a/04/a125e9b5fba631401936f9db89e3315a317ed0 b/04/a125e9b5fba631401936f9db89e3315a317ed0
new file mode 100644 (file)
index 0000000..4ec19f9
--- /dev/null
+++ b/04/a125e9b5fba631401936f9db89e3315a317ed0
@@ -0,0 +1,131 @@
+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 2D724431FDF\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:38 -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 eT9If0j9fzpa for <notmuch@notmuchmail.org>;\r
+       Mon, 12 May 2014 05:29:33 -0700 (PDT)\r
+Received: from mail-we0-f177.google.com (mail-we0-f177.google.com\r
+       [74.125.82.177]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 407A4431FC7\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:33 -0700 (PDT)\r
+Received: by mail-we0-f177.google.com with SMTP id x48so6656003wes.22\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:32 -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=fQ6nCL7txEWTecPqU4ztiDfdNjKVzxU2hdZiGm++bhk=;\r
+       b=ACsfd8P31jenGKdJe/IGdvWwFs6ygp6wuy6dzCG6TinRTGMDTzTegBUVKKX5IdVhsq\r
+       4GawgUtdU+XIIXKj0r6fAUvrff7+xsIjpPbnBoemVSATCqcMDYZ48zEmVnN/HsA788T+\r
+       TNSPP5F4meGR8ngt57iyjHIVIcii5vCKLZFmi+1hxuvHap7v9VjgY5P8YHEN4XGgRknZ\r
+       wFNt84vW5twhFW5lSyazHfhV0HDxnAJ6nltI9b3oRsm6HQNPGXDZPzXiD6ks8SjGcsM9\r
+       /lRnd1mUmBbhz35yIMD7Ke/X5g+MmD+4KVpiAd7miGoFGgp8VMI4xEiFSBBNnFboVPZC\r
+       wZGw==\r
+X-Gm-Message-State:\r
+ ALoCoQnOAJNcXF6xzo1X1z1Kxbcmy7mgOhYQgedp4XMwVys7Bs5Ac29qxAMnNjiBBhBcxQboTisL\r
+X-Received: by 10.180.78.5 with SMTP id x5mr15515388wiw.12.1399897771989;\r
+       Mon, 12 May 2014 05:29:31 -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\r
+       fu10sm15873680wib.11.2014.05.12.05.29.30\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:30 -0700 (PDT)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 395A710B324; 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 2/9] emacs/show: Allow the user to decide when part headers\r
+       should be inserted\r
+Date: Mon, 12 May 2014 13:29:22 +0100\r
+Message-Id: <1399897769-26809-3-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:38 -0000\r
+\r
+Make the function that determines whether a part header should be\r
+inserted a user controlled, with some example functions.\r
+---\r
+ emacs/notmuch-show.el | 21 +++++++++++++++++++--\r
+ 1 file changed, 19 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index ec99141..f78a0ab 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -135,6 +135,17 @@ indentation."\r
+   :type 'boolean\r
+   :group 'notmuch-show)\r
+ \r
++(defcustom notmuch-show-insert-header-p-function 'notmuch-show-insert-header-p-smart\r
++  "A function to call to determine whether a MIME part should have a header button.\r
++\r
++The function is passed one argument, PART - the MIME part in\r
++question."\r
++  :type 'function\r
++  :group 'notmuch-show\r
++  :options '(notmuch-show-insert-header-p-smart\r
++           notmuch-show-insert-header-p-always\r
++           notmuch-show-insert-header-p-never))\r
++\r
+ (defvar notmuch-show-thread-id nil)\r
+ (make-variable-buffer-local 'notmuch-show-thread-id)\r
+ (put 'notmuch-show-thread-id 'permanent-local t)\r
+@@ -880,12 +891,18 @@ message at DEPTH in the current thread."\r
+            "text/x-diff")\r
+       content-type)))\r
+ \r
+-(defun notmuch-show-insert-header-p (part)\r
++(defun notmuch-show-insert-header-p-smart (part)\r
+   "Return non-NIL if a header button should be inserted for this part."\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-insert-header-p-always (part)\r
++  t)\r
++\r
++(defun notmuch-show-insert-header-p-never (part)\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
+@@ -904,7 +921,7 @@ useful for quoting in replies)."\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))\r
++                          (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