1 Return-Path: <pieter@praet.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 A7DC5429E29
\r
6 for <notmuch@notmuchmail.org>; Sun, 3 Jul 2011 23:52:37 -0700 (PDT)
\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 tXjV-STdy9VJ for <notmuch@notmuchmail.org>;
\r
16 Sun, 3 Jul 2011 23:52:37 -0700 (PDT)
\r
17 Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com
\r
18 [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
19 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
20 02D81429E27 for <notmuch@notmuchmail.org>; Sun, 3 Jul 2011 23:52:36 -0700
\r
22 Received: by wwj40 with SMTP id 40so3858165wwj.2
\r
23 for <notmuch@notmuchmail.org>; Sun, 03 Jul 2011 23:52:35 -0700 (PDT)
\r
24 Received: by 10.227.154.6 with SMTP id m6mr5034155wbw.73.1309762355792;
\r
25 Sun, 03 Jul 2011 23:52:35 -0700 (PDT)
\r
26 Received: from localhost ([109.131.160.67])
\r
27 by mx.google.com with ESMTPS id fu18sm4222090wbb.61.2011.07.03.23.52.34
\r
28 (version=TLSv1/SSLv3 cipher=OTHER);
\r
29 Sun, 03 Jul 2011 23:52:35 -0700 (PDT)
\r
30 From: Pieter Praet <pieter@praet.org>
\r
31 To: Austin Clements <amdragon@mit.edu>
\r
32 Subject: [PATCH 1/5] emacs: add property "matched-msgids" to each search
\r
34 Date: Mon, 4 Jul 2011 08:51:54 +0200
\r
35 Message-Id: <1309762318-4530-2-git-send-email-pieter@praet.org>
\r
36 X-Mailer: git-send-email 1.7.5.4
\r
37 In-Reply-To: <1309762318-4530-1-git-send-email-pieter@praet.org>
\r
38 References: <20110703171743.GL15901@mit.edu>
\r
39 <1309762318-4530-1-git-send-email-pieter@praet.org>
\r
40 Cc: Notmuch Mail <notmuch@notmuchmail.org>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Mon, 04 Jul 2011 06:52:37 -0000
\r
55 Signed-off-by: Pieter Praet <pieter@praet.org>
\r
57 emacs/notmuch.el | 4 +++-
\r
58 1 files changed, 3 insertions(+), 1 deletions(-)
\r
60 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
61 index f11ec24..674deb7 100644
\r
62 --- a/emacs/notmuch.el
\r
63 +++ b/emacs/notmuch.el
\r
64 @@ -801,13 +801,14 @@ non-authors is found, assume that all of the authors match."
\r
66 (while (and (< line (length string)) (= (elt string line) ?\n))
\r
67 (setq line (1+ line)))
\r
68 - (if (string-match "^\\(thread:[0-9A-Fa-f]*\\) \\([^][]*\\) \\(\\[[0-9/]*\\]\\) \\([^;]*\\); \\(.*\\) (\\([^()]*\\))$" string line)
\r
69 + (if (string-match "^\\(thread:[0-9A-Fa-f]*\\) \\([^][]*\\) \\(\\[[0-9/]*\\]\\) \\([^;]*\\); \\(.*\\) (\\([^()]*\\)) \\(.*\\)$" string line)
\r
70 (let* ((thread-id (match-string 1 string))
\r
71 (date (match-string 2 string))
\r
72 (count (match-string 3 string))
\r
73 (authors (match-string 4 string))
\r
74 (subject (match-string 5 string))
\r
75 (tags (match-string 6 string))
\r
76 + (matched-msgids (match-string 7 string))
\r
77 (tag-list (if tags (save-match-data (split-string tags)))))
\r
78 (goto-char (point-max))
\r
79 (if (/= (match-beginning 1) line)
\r
80 @@ -816,6 +817,7 @@ non-authors is found, assume that all of the authors match."
\r
81 (notmuch-search-show-result date count authors subject tags)
\r
82 (notmuch-search-color-line beg (point-marker) tag-list)
\r
83 (put-text-property beg (point-marker) 'notmuch-search-thread-id thread-id)
\r
84 + (put-text-property beg (point-marker) 'notmuch-search-matched-msgids matched-msgids)
\r
85 (put-text-property beg (point-marker) 'notmuch-search-authors authors)
\r
86 (put-text-property beg (point-marker) 'notmuch-search-subject subject)
\r
87 (if (string= thread-id notmuch-search-target-thread)
\r