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 5D794429E3A
\r
6 for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:52:11 -0700 (PDT)
\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 RaZoU6H31qSV for <notmuch@notmuchmail.org>;
\r
18 Sat, 22 Mar 2014 04:52:05 -0700 (PDT)
\r
19 Received: from mail-we0-f179.google.com (mail-we0-f179.google.com
\r
20 [74.125.82.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 25FD0431FC4
\r
23 for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:51:38 -0700 (PDT)
\r
24 Received: by mail-we0-f179.google.com with SMTP id x48so2289859wes.10
\r
25 for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:51:37 -0700 (PDT)
\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=FZm9rxNSdyqOZsCocwmHG6SegLk9ZC4T1RbsHggNT54=;
\r
30 b=WuEjp24pskRcTLnvY4ykg63cmmxL1b0VvHT1Mhx9xDNHMFYbgd5UbW4R1k2gPDQh9O
\r
31 4m3BNh6NiAHLhLeOxOEtETOrPjsnZlLgEIgW/4DgvzoQvE32Ey3+Rl9kfxChsExx6ubO
\r
32 CF411U+Tokv7KJhKcBCqN5Ara8dCxfBg43g6oBJ17YDH5Rp3S0jKgLt8Qzihk9zsCf6r
\r
33 i27ZCLuGyqOOt+Mnh0kAKxHmdnIkA8Pu0ke9H2WXhKxZxGJt8XOyrDRW+Bc3JZaPC0oF
\r
34 2HJHqfeujCrKqnVYy9g6LVy5qzL1Ac4RYCzE2uf/5mbyi9pdjP3J54SBkn5R1yQFIaux
\r
36 X-Received: by 10.180.23.99 with SMTP id l3mr3275251wif.47.1395489097100;
\r
37 Sat, 22 Mar 2014 04:51:37 -0700 (PDT)
\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 f3sm16245200wiv.2.2014.03.22.04.51.35
\r
40 for <multiple recipients>
\r
41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
42 Sat, 22 Mar 2014 04:51:36 -0700 (PDT)
\r
43 From: Mark Walters <markwalters1009@gmail.com>
\r
44 To: notmuch@notmuchmail.org,
\r
46 Subject: [Patch v4 8/8] emacs: tree: use orig-tags in search
\r
47 Date: Sat, 22 Mar 2014 11:51:12 +0000
\r
48 Message-Id: <1395489072-19001-9-git-send-email-markwalters1009@gmail.com>
\r
49 X-Mailer: git-send-email 1.7.10.4
\r
50 In-Reply-To: <1395489072-19001-1-git-send-email-markwalters1009@gmail.com>
\r
51 References: <1395489072-19001-1-git-send-email-markwalters1009@gmail.com>
\r
53 Content-Type: text/plain; charset=UTF-8
\r
54 Content-Transfer-Encoding: 8bit
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Sat, 22 Mar 2014 11:52:11 -0000
\r
69 This uses the recent functionality to show the tag changes in the tree
\r
70 buffer. Currently this is only used to show changes the tree buffer
\r
71 makes itself: i.e., it does not make display any changes reflecting
\r
72 tagging done by other notmuch-buffers.
\r
74 emacs/notmuch-tree.el | 9 ++++++---
\r
75 1 file changed, 6 insertions(+), 3 deletions(-)
\r
77 diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
\r
78 index 8bf2fbc..7d5f475 100644
\r
79 --- a/emacs/notmuch-tree.el
\r
80 +++ b/emacs/notmuch-tree.el
\r
81 @@ -701,10 +701,11 @@ (defun notmuch-tree-format-field (field format-string msg)
\r
83 ((string-equal field "tags")
\r
84 (let ((tags (plist-get msg :tags))
\r
85 + (orig-tags (plist-get msg :orig-tags))
\r
87 'notmuch-tree-match-tag-face
\r
88 'notmuch-tree-no-match-tag-face)))
\r
89 - (format format-string (notmuch-tag-format-tags tags tags face)))))))
\r
90 + (format format-string (notmuch-tag-format-tags tags orig-tags face)))))))
\r
92 (defun notmuch-tree-format-field-list (field-list msg)
\r
93 "Format fields of MSG according to FIELD-LIST and return string"
\r
94 @@ -766,8 +767,10 @@ (defun notmuch-tree-insert-tree (tree depth tree-status first last)
\r
95 (push "├" tree-status)))
\r
97 (push (concat (if replies "┬" "─") "►") tree-status)
\r
98 - (plist-put msg :first (and first (eq 0 depth)))
\r
99 - (notmuch-tree-goto-and-insert-msg (plist-put msg :tree-status tree-status))
\r
100 + (setq msg (plist-put msg :first (and first (eq 0 depth))))
\r
101 + (setq msg (plist-put msg :tree-status tree-status))
\r
102 + (setq msg (plist-put msg :orig-tags (plist-get msg :tags)))
\r
103 + (notmuch-tree-goto-and-insert-msg msg)
\r