[PATCH v3 2/3] emacs: Optionally hide some part headers.

diff --git a/a0/8da7ceed7ecc9d4262903348bdc96517dac9ab b/a0/8da7ceed7ecc9d4262903348bdc96517dac9ab
new file mode 100644 (file)
index 0000000..b4485a1
--- /dev/null
+++ b/a0/8da7ceed7ecc9d4262903348bdc96517dac9ab
@@ -0,0 +1,128 @@
+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 798E8431FCB\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Feb 2012 07:39:19 -0800 (PST)\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 6urgHWwPcOl7 for <notmuch@notmuchmail.org>;\r
+       Mon,  6 Feb 2012 07:39:16 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id ECFD9431FAF\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Feb 2012 07:39:15 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so4927745wib.26\r
+       for <notmuch@notmuchmail.org>; Mon, 06 Feb 2012 07:39:14 -0800 (PST)\r
+Received: by 10.180.103.68 with SMTP id fu4mr24991109wib.7.1328542754254;\r
+       Mon, 06 Feb 2012 07:39:14 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id p10sm26449625wic.0.2012.02.06.07.39.10\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 06 Feb 2012 07:39:11 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 52146A0E82; Mon,  6 Feb 2012 15:39:09 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 2/3] emacs: Optionally hide some part headers.\r
+Date: Mon,  6 Feb 2012 15:39:07 +0000\r
+Message-Id: <1328542748-19530-4-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1328542748-19530-1-git-send-email-dme@dme.org>\r
+References: <1327052612-1040-1-git-send-email-dme@dme.org>\r
+       <1328542748-19530-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, 06 Feb 2012 15:39:19 -0000\r
+\r
+Add a regexp, `notmuch-show-part-headers-hidden' and if the\r
+content-type of a part matches, don't show the part header.\r
+---\r
+ emacs/notmuch-show.el |   43 ++++++++++++++++++++++++++++---------------\r
+ 1 files changed, 28 insertions(+), 15 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 079d7cb..ce79762 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -125,6 +125,12 @@ indentation."\r
+                (const :tag "View interactively"\r
+                       notmuch-show-interactively-view-part)))\r
+ \r
++(defcustom notmuch-show-part-headers-hidden nil\r
++  "Headers for parts whose content-type matches this regexp will\r
++not be shown."\r
++  :group 'notmuch\r
++  :type 'regexp)\r
++\r
+ (defmacro with-current-notmuch-show-message (&rest body)\r
+   "Evaluate body with current buffer set to the text of current message"\r
+   `(save-excursion\r
+@@ -397,24 +403,31 @@ message at DEPTH in the current thread."\r
+   "Submap for button commands")\r
+ (fset 'notmuch-show-part-button-map notmuch-show-part-button-map)\r
+ \r
++(defun notmuch-show-hidden-part-header (content-type)\r
++  "Return non-nil if a part header should be hidden for\r
++CONTENT-TYPE parts."\r
++  (and notmuch-show-part-headers-hidden\r
++       (string-match notmuch-show-part-headers-hidden content-type)))\r
++\r
+ (defun notmuch-show-insert-part-header (nth content-type declared-type\r
+                                           &optional name comment\r
+                                           &rest button-parameters)\r
+-  (apply #'insert-button\r
+-       (concat "[ "\r
+-               (if name (concat name ": ") "")\r
+-               declared-type\r
+-               (if (not (string-equal declared-type content-type))\r
+-                   (concat " (as " content-type ")")\r
+-                 "")\r
+-               (or comment "")\r
+-               " ]")\r
+-       :type 'notmuch-show-part-button-type\r
+-       :notmuch-part nth\r
+-       :notmuch-filename name\r
+-       :notmuch-content-type content-type\r
+-       button-parameters)\r
+-  (insert "\n"))\r
++  (unless (notmuch-show-hidden-part-header content-type)\r
++    (apply #'insert-button\r
++         (concat "[ "\r
++                 (if name (concat name ": ") "")\r
++                 declared-type\r
++                 (if (not (string-equal declared-type content-type))\r
++                     (concat " (as " content-type ")")\r
++                   "")\r
++                 (or comment "")\r
++                 " ]")\r
++         :type 'notmuch-show-part-button-type\r
++         :notmuch-part nth\r
++         :notmuch-filename name\r
++         :notmuch-content-type content-type\r
++         button-parameters)\r
++    (insert "\n")))\r
+ \r
+ ;; Functions handling particular MIME parts.\r
+ \r
+-- \r
+1.7.8.3\r
+\r