[PATCH 3/3 v2] emacs: Don't insert a part header if it's the first part and text/*.

diff --git a/17/b2c84f2201df6426b84eb2f3df4af6eb0b6c54 b/17/b2c84f2201df6426b84eb2f3df4af6eb0b6c54
new file mode 100644 (file)
index 0000000..c98353d
--- /dev/null
+++ b/17/b2c84f2201df6426b84eb2f3df4af6eb0b6c54
@@ -0,0 +1,98 @@
+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 1BDAF42119A\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:13 -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 QVKE0ab242ZK for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Jan 2012 02:33:12 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4216D421192\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:12 -0800 (PST)\r
+Received: by werb10 with SMTP id b10so2306569wer.26\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:09 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.19.138 with SMTP id f10mr15632077wie.3.1327314789923;\r
+       Mon, 23 Jan 2012 02:33:09 -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 em13sm12123090wid.7.2012.01.23.02.33.08\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 23 Jan 2012 02:33:08 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id B0D03A0B03; Mon, 23 Jan 2012 10:33:06 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3 v2] emacs: Don't insert a part header if it's the first\r
+       part and text/*.\r
+Date: Mon, 23 Jan 2012 10:33:04 +0000\r
+Message-Id: <1327314784-22555-3-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327314784-22555-1-git-send-email-dme@dme.org>\r
+References: <cun39b66avm.fsf@hotblack-desiato.hh.sledj.net>\r
+       <1327314784-22555-1-git-send-email-dme@dme.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnj8uU9ayVWkghzx5yKxxqZDQukdpvDNLrMPzldtuZ5yA2ieL6aHH8t81A4FhQlvwOVjSCh\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, 23 Jan 2012 10:33:13 -0000\r
+\r
+Previously this logic applied only to text/plain. Allow it for other\r
+text/* parts as well.\r
+---\r
+\r
+This was not included in version 1 of the patch set.\r
+\r
+ emacs/notmuch-show.el |    9 ++++-----\r
+ 1 files changed, 4 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 39f35ed..55e4e34 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -300,7 +300,9 @@ CONTENT-TYPE parts."\r
+ (defun notmuch-show-insert-part-header (nth content-type declared-type\r
+                                           &optional name comment\r
+                                           &rest button-parameters)\r
+-  (unless (notmuch-show-hidden-part-header content-type)\r
++  (unless (or (notmuch-show-hidden-part-header content-type)\r
++            (and (= nth 1)\r
++                 (string-match "text/*" content-type)))\r
+     (apply #'insert-button\r
+          (concat "[ "\r
+                  (if name (concat name ": ") "")\r
+@@ -561,10 +563,7 @@ current buffer, if possible."\r
+ \r
+ (defun notmuch-show-insert-part-text/plain (msg part content-type nth depth declared-type)\r
+   (let ((start (point)))\r
+-    ;; If this text/plain part is not the first part in the message,\r
+-    ;; insert a header to make this clear.\r
+-    (if (> nth 1)\r
+-      (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename)))\r
++    (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename))\r
+     (insert (notmuch-show-get-bodypart-content msg part nth))\r
+     (save-excursion\r
+       (save-restriction\r
+-- \r
+1.7.8.3\r
+\r