1 Return-Path: <bremner@tesseract.cs.unb.ca>
\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 arlo.cworth.org (Postfix) with ESMTP id 5C8E36DE1BC4
\r
6 for <notmuch@notmuchmail.org>; Sun, 5 Apr 2015 16:03:22 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.511 tagged_above=-999 required=5 tests=[AWL=0.501,
\r
12 T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Pk5QjLLDVjae for <notmuch@notmuchmail.org>;
\r
16 Sun, 5 Apr 2015 16:03:20 -0700 (PDT)
\r
17 Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net
\r
19 by arlo.cworth.org (Postfix) with ESMTPS id C531E6DE1BB0
\r
20 for <notmuch@notmuchmail.org>; Sun, 5 Apr 2015 16:03:18 -0700 (PDT)
\r
21 Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim
\r
22 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
23 id 1YetYr-0002pw-AP; Sun, 05 Apr 2015 23:02:37 +0000
\r
24 Received: (nullmailer pid 2257 invoked by uid 1000); Sun, 05 Apr 2015
\r
26 From: David Bremner <david@tethera.net>
\r
27 To: notmuch@notmuchmail.org
\r
28 Subject: [WIP2 11/12] emacs: convert notmuch-tree to format-version 3
\r
29 Date: Mon, 6 Apr 2015 07:59:13 +0900
\r
30 Message-Id: <1428274754-1698-12-git-send-email-david@tethera.net>
\r
31 X-Mailer: git-send-email 2.1.4
\r
32 In-Reply-To: <1428274754-1698-1-git-send-email-david@tethera.net>
\r
33 References: <1428274754-1698-1-git-send-email-david@tethera.net>
\r
34 X-BeenThere: notmuch@notmuchmail.org
\r
35 X-Mailman-Version: 2.1.18
\r
37 List-Id: "Use and development of the notmuch mail system."
\r
38 <notmuch.notmuchmail.org>
\r
39 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
41 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
42 List-Post: <mailto:notmuch@notmuchmail.org>
\r
43 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
44 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
46 X-List-Received-Date: Sun, 05 Apr 2015 23:03:22 -0000
\r
48 This is similarly trivial conversion to that applied to
\r
49 notmuch-search, and is subject to the same objections
\r
51 emacs/notmuch-tree.el | 11 ++++++-----
\r
52 1 file changed, 6 insertions(+), 5 deletions(-)
\r
54 diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
\r
55 index ca5f9b6..bae3de0 100644
\r
56 --- a/emacs/notmuch-tree.el
\r
57 +++ b/emacs/notmuch-tree.el
\r
58 @@ -774,10 +774,11 @@ message together with all its descendents."
\r
60 (defun notmuch-tree-insert-forest-thread (forest-thread)
\r
61 "Insert a single complete thread."
\r
62 - (let (tree-status)
\r
63 - ;; Reset at the start of each main thread.
\r
64 - (setq notmuch-tree-previous-subject nil)
\r
65 - (notmuch-tree-insert-thread forest-thread 0 tree-status)))
\r
66 + (unless (notmuch-query-metadata-p forest-thread)
\r
67 + (let (tree-status)
\r
68 + ;; Reset at the start of each main thread.
\r
69 + (setq notmuch-tree-previous-subject nil)
\r
70 + (notmuch-tree-insert-thread forest-thread 0 tree-status))))
\r
72 (defun notmuch-tree-insert-forest (forest)
\r
73 "Insert a forest of threads.
\r
74 @@ -871,7 +872,7 @@ the same as for the function notmuch-tree."
\r
75 (notmuch-tag-clear-cache)
\r
76 (let ((proc (notmuch-start-notmuch
\r
77 "notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel
\r
78 - "show" "--body=false" "--format=sexp" "--format-version=2"
\r
79 + "show" "--body=false" "--format=sexp" "--format-version=3"
\r
80 message-arg search-args))
\r
81 ;; Use a scratch buffer to accumulate partial output.
\r
82 ;; This buffer will be killed by the sentinel, which
\r