1 Return-Path: <dme@dme.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 1BDAF42119A
\r
6 for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:13 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id QVKE0ab242ZK for <notmuch@notmuchmail.org>;
\r
16 Mon, 23 Jan 2012 02:33:12 -0800 (PST)
\r
17 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com
\r
18 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 4216D421192
\r
21 for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:12 -0800 (PST)
\r
22 Received: by werb10 with SMTP id b10so2306569wer.26
\r
23 for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:09 -0800 (PST)
\r
25 Received: by 10.180.19.138 with SMTP id f10mr15632077wie.3.1327314789923;
\r
26 Mon, 23 Jan 2012 02:33:09 -0800 (PST)
\r
27 Received: from hotblack-desiato.hh.sledj.net
\r
28 (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])
\r
29 by mx.google.com with ESMTPS id em13sm12123090wid.7.2012.01.23.02.33.08
\r
30 (version=TLSv1/SSLv3 cipher=OTHER);
\r
31 Mon, 23 Jan 2012 02:33:08 -0800 (PST)
\r
32 Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)
\r
33 id B0D03A0B03; Mon, 23 Jan 2012 10:33:06 +0000 (GMT)
\r
34 From: David Edmondson <dme@dme.org>
\r
35 To: notmuch@notmuchmail.org
\r
36 Subject: [PATCH 3/3 v2] emacs: Don't insert a part header if it's the first
\r
38 Date: Mon, 23 Jan 2012 10:33:04 +0000
\r
39 Message-Id: <1327314784-22555-3-git-send-email-dme@dme.org>
\r
40 X-Mailer: git-send-email 1.7.8.3
\r
41 In-Reply-To: <1327314784-22555-1-git-send-email-dme@dme.org>
\r
42 References: <cun39b66avm.fsf@hotblack-desiato.hh.sledj.net>
\r
43 <1327314784-22555-1-git-send-email-dme@dme.org>
\r
45 ALoCoQnj8uU9ayVWkghzx5yKxxqZDQukdpvDNLrMPzldtuZ5yA2ieL6aHH8t81A4FhQlvwOVjSCh
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Mon, 23 Jan 2012 10:33:13 -0000
\r
60 Previously this logic applied only to text/plain. Allow it for other
\r
61 text/* parts as well.
\r
64 This was not included in version 1 of the patch set.
\r
66 emacs/notmuch-show.el | 9 ++++-----
\r
67 1 files changed, 4 insertions(+), 5 deletions(-)
\r
69 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
70 index 39f35ed..55e4e34 100644
\r
71 --- a/emacs/notmuch-show.el
\r
72 +++ b/emacs/notmuch-show.el
\r
73 @@ -300,7 +300,9 @@ CONTENT-TYPE parts."
\r
74 (defun notmuch-show-insert-part-header (nth content-type declared-type
\r
75 &optional name comment
\r
76 &rest button-parameters)
\r
77 - (unless (notmuch-show-hidden-part-header content-type)
\r
78 + (unless (or (notmuch-show-hidden-part-header content-type)
\r
80 + (string-match "text/*" content-type)))
\r
81 (apply #'insert-button
\r
83 (if name (concat name ": ") "")
\r
84 @@ -561,10 +563,7 @@ current buffer, if possible."
\r
86 (defun notmuch-show-insert-part-text/plain (msg part content-type nth depth declared-type)
\r
87 (let ((start (point)))
\r
88 - ;; If this text/plain part is not the first part in the message,
\r
89 - ;; insert a header to make this clear.
\r
91 - (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename)))
\r
92 + (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename))
\r
93 (insert (notmuch-show-get-bodypart-content msg part nth))
\r