1 Return-Path: <markwalters1009@gmail.com>
\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 84D70431FD4
\r
6 for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:39 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id VSTtomw3mvE3 for <notmuch@notmuchmail.org>;
\r
18 Sat, 18 Jan 2014 15:31:35 -0800 (PST)
\r
19 Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com
\r
20 [74.125.82.48]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
21 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
22 4351C431FD7 for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:14 -0800
\r
24 Received: by mail-wg0-f48.google.com with SMTP id x13so5675819wgg.3
\r
25 for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:13 -0800 (PST)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:in-reply-to:references
\r
28 :mime-version:content-type:content-transfer-encoding;
\r
29 bh=fiqfOMYGawyOflOdOHDxirA+gtU+CjbHtynsr56gwMc=;
\r
30 b=ODScDNiOvF72lBnzNZxe20qu5rWXNLMnk0KNcgBNcQJdEEDwGqlfI+Vz0IFge/I8wU
\r
31 6AFnLcC+Hfr/HUMVjwci9GEt60tZb4Tci+CBi1w4wDBJZveK8F8Wpg+7owRHPvMcfqIS
\r
32 +O5jgIZGw7KEnMDz5/TFzYFSONV/AIe2osKXKBvr4v/rLFuTGEkABC2ODh6HJ4pSCfi9
\r
33 YwksR5lkwz1hCjyRfae6DLsbSm20ZQSeKfz3RUCTRNYKefSLtyXwgBu+PElvv/Iu6mgx
\r
34 CVqnropJjyxtR8JSFqJ+x7cjW0s2vOPH4UT5brEYICRsB41f6FfRfOfne9pcnBod4lo+
\r
36 X-Received: by 10.194.110.41 with SMTP id hx9mr8180849wjb.28.1390087873065;
\r
37 Sat, 18 Jan 2014 15:31:13 -0800 (PST)
\r
38 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
\r
39 by mx.google.com with ESMTPSA id ea4sm10972696wib.7.2014.01.18.15.31.12
\r
40 for <multiple recipients>
\r
41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
42 Sat, 18 Jan 2014 15:31:12 -0800 (PST)
\r
43 From: Mark Walters <markwalters1009@gmail.com>
\r
44 To: notmuch@notmuchmail.org
\r
45 Subject: [PATCH 7/7] emacs: tree: use orig-tags in search
\r
46 Date: Sat, 18 Jan 2014 23:30:55 +0000
\r
47 Message-Id: <1390087855-26194-8-git-send-email-markwalters1009@gmail.com>
\r
48 X-Mailer: git-send-email 1.7.9.1
\r
49 In-Reply-To: <1390087855-26194-1-git-send-email-markwalters1009@gmail.com>
\r
50 References: <1390087855-26194-1-git-send-email-markwalters1009@gmail.com>
\r
52 Content-Type: text/plain; charset=UTF-8
\r
53 Content-Transfer-Encoding: 8bit
\r
54 X-BeenThere: notmuch@notmuchmail.org
\r
55 X-Mailman-Version: 2.1.13
\r
57 List-Id: "Use and development of the notmuch mail system."
\r
58 <notmuch.notmuchmail.org>
\r
59 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
61 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
62 List-Post: <mailto:notmuch@notmuchmail.org>
\r
63 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
64 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
66 X-List-Received-Date: Sat, 18 Jan 2014 23:31:39 -0000
\r
68 This uses the recent functionality to show the tag changes in the tree
\r
69 buffer. Currently this is only used to show changes the tree buffer
\r
70 makes itself: i.e., it does not make display any changes reflecting
\r
71 tagging done by other notmuch-buffers.
\r
73 emacs/notmuch-tree.el | 9 ++++++---
\r
74 1 files changed, 6 insertions(+), 3 deletions(-)
\r
76 diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
\r
77 index b37e2cd..0f4cd47 100644
\r
78 --- a/emacs/notmuch-tree.el
\r
79 +++ b/emacs/notmuch-tree.el
\r
80 @@ -701,10 +701,11 @@ unchanged ADDRESS if parsing fails."
\r
82 ((string-equal field "tags")
\r
83 (let ((tags (plist-get msg :tags))
\r
84 + (orig-tags (plist-get msg :orig-tags))
\r
86 'notmuch-tree-match-tag-face
\r
87 'notmuch-tree-no-match-tag-face)))
\r
88 - (format format-string (notmuch-tag-format-tags tags tags face)))))))
\r
89 + (format format-string (notmuch-tag-format-tags tags orig-tags face)))))))
\r
91 (defun notmuch-tree-format-field-list (field-list msg)
\r
92 "Format fields of MSG according to FIELD-LIST and return string"
\r
93 @@ -766,8 +767,10 @@ message together with all its descendents."
\r
94 (push "├" tree-status)))
\r
96 (push (concat (if replies "┬" "─") "►") tree-status)
\r
97 - (plist-put msg :first (and first (eq 0 depth)))
\r
98 - (notmuch-tree-goto-and-insert-msg (plist-put msg :tree-status tree-status))
\r
99 + (setq msg (plist-put msg :first (and first (eq 0 depth))))
\r
100 + (setq msg (plist-put msg :tree-status tree-status))
\r
101 + (setq msg (plist-put msg :orig-tags (plist-get msg :tags)))
\r
102 + (notmuch-tree-goto-and-insert-msg msg)
\r