1 Return-Path: <m.walters@qmul.ac.uk>
\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 186A6431FAF
\r
6 for <notmuch@notmuchmail.org>; Mon, 3 Jun 2013 09:33:52 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5
\r
12 tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,
\r
13 NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id B0ZT4bGwbOVW for <notmuch@notmuchmail.org>;
\r
17 Mon, 3 Jun 2013 09:33:44 -0700 (PDT)
\r
18 Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 2B916431FAE
\r
22 for <notmuch@notmuchmail.org>; Mon, 3 Jun 2013 09:33:44 -0700 (PDT)
\r
23 Received: from smtp.qmul.ac.uk ([138.37.6.40])
\r
24 by mail2.qmul.ac.uk with esmtp (Exim 4.71)
\r
25 (envelope-from <m.walters@qmul.ac.uk>)
\r
26 id 1UjXhR-0004dl-9d; Mon, 03 Jun 2013 17:33:42 +0100
\r
27 Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)
\r
28 by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)
\r
29 (envelope-from <m.walters@qmul.ac.uk>)
\r
30 id 1UjXhR-0001CV-1y; Mon, 03 Jun 2013 17:33:37 +0100
\r
31 From: Mark Walters <markwalters1009@gmail.com>
\r
32 To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
\r
33 Subject: Re: [PATCH] emacs: Fix applying stickiness to the :notmuch-part
\r
35 In-Reply-To: <1370272679-20175-1-git-send-email-amdragon@mit.edu>
\r
36 References: <1370272679-20175-1-git-send-email-amdragon@mit.edu>
\r
37 User-Agent: Notmuch/0.14+255~gff3cc55 (http://notmuchmail.org) Emacs/23.4.1
\r
39 Date: Mon, 03 Jun 2013 17:33:35 +0100
\r
40 Message-ID: <878v2rf928.fsf@qmul.ac.uk>
\r
42 Content-Type: text/plain; charset=us-ascii
\r
43 X-Sender-Host-Address: 93.97.24.31
\r
44 X-QM-SPAM-Info: Sender has good ham record. :)
\r
45 X-QM-Body-MD5: fa082a8cc85353dffe10fe9d19b6a5ba (of first 20000 bytes)
\r
46 X-SpamAssassin-Score: -0.0
\r
47 X-SpamAssassin-SpamBar: /
\r
48 X-SpamAssassin-Report: The QM spam filters have analysed this message to
\r
50 spam. We require at least 5.0 points to mark a message as spam.
\r
51 This message scored -0.0 points.
\r
52 Summary of the scoring:
\r
53 * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
\r
54 provider * (markwalters1009[at]gmail.com)
\r
55 * -0.0 AWL AWL: From: address is in the auto white-list
\r
56 X-QM-Scan-Virus: ClamAV says the message is clean
\r
57 X-BeenThere: notmuch@notmuchmail.org
\r
58 X-Mailman-Version: 2.1.13
\r
60 List-Id: "Use and development of the notmuch mail system."
\r
61 <notmuch.notmuchmail.org>
\r
62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
65 List-Post: <mailto:notmuch@notmuchmail.org>
\r
66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
69 X-List-Received-Date: Mon, 03 Jun 2013 16:33:52 -0000
\r
72 LGTM +1. This fixes the test failures (and errors in the emacs display) I was seeing on one of my systems.
\r
80 Austin Clements <amdragon@MIT.EDU> writes:
\r
82 > Previously, we simply called pushnew to add :notmuch-part to the
\r
83 > front-sticky and rear-nonsticky text property lists. This works if
\r
84 > these are nil or lists, but they can also have the value t, meaning
\r
85 > that all properties are front-sticky/rear-nonsticky. In this case,
\r
86 > pushnew will signal an error because t is not a list. We never set
\r
87 > these properties to t ourselves, but since we apply these property
\r
88 > changes over arbitrary renderer output, we have to deal with this
\r
91 > emacs/notmuch-show.el | 13 ++++++++++---
\r
92 > 1 file changed, 10 insertions(+), 3 deletions(-)
\r
94 > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
95 > index 5771950..83bb9ad 100644
\r
96 > --- a/emacs/notmuch-show.el
\r
97 > +++ b/emacs/notmuch-show.el
\r
98 > @@ -846,11 +846,18 @@ If HIDE is non-nil then initially hide this part."
\r
99 > (notmuch-map-text-property beg (point) :notmuch-part
\r
100 > (lambda (v) (or v part)))
\r
101 > ;; Make :notmuch-part front sticky and rear non-sticky so it stays
\r
102 > - ;; applied to the beginning of each line when we indent the message.
\r
103 > + ;; applied to the beginning of each line when we indent the
\r
104 > + ;; message. Since we're operating on arbitrary renderer output,
\r
105 > + ;; watch out for sticky specs of t, which means all properties are
\r
106 > + ;; front-sticky/rear-nonsticky.
\r
107 > (notmuch-map-text-property beg (point) 'front-sticky
\r
108 > - (lambda (v) (pushnew :notmuch-part v)))
\r
109 > + (lambda (v) (if (listp v)
\r
110 > + (pushnew :notmuch-part v)
\r
112 > (notmuch-map-text-property beg (point) 'rear-nonsticky
\r
113 > - (lambda (v) (pushnew :notmuch-part v)))))
\r
114 > + (lambda (v) (if (listp v)
\r
115 > + (pushnew :notmuch-part v)
\r
118 > (defun notmuch-show-insert-body (msg body depth)
\r
119 > "Insert the body BODY at depth DEPTH in the current thread."
\r