1 Return-Path: <jani@nikula.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 EB760431FBD
\r
6 for <notmuch@notmuchmail.org>; Wed, 31 Oct 2012 03:00:16 -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 mxbvFuc6cxmy for <notmuch@notmuchmail.org>;
\r
16 Wed, 31 Oct 2012 03:00:15 -0700 (PDT)
\r
17 Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com
\r
18 [209.85.220.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id E583F431FBC
\r
21 for <notmuch@notmuchmail.org>; Wed, 31 Oct 2012 03:00:14 -0700 (PDT)
\r
22 Received: by mail-vc0-f181.google.com with SMTP id n11so1505336vch.26
\r
23 for <notmuch@notmuchmail.org>; Wed, 31 Oct 2012 03:00:13 -0700 (PDT)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=google.com; s=20120113;
\r
26 h=from:to:cc:subject:in-reply-to:references:user-agent:date
\r
27 :message-id:mime-version:content-type:x-gm-message-state;
\r
28 bh=+FqGvOxfO3NVFiAVmrtKh3/AjY2x3oCnFOgn/DQG5XM=;
\r
29 b=dGwExtmZObL2gsuGK10a0Xph9uVBOZoGxC95UPgwkDAPVQN2h7NGmljvqPo6I1UpwP
\r
30 1kYfqiyTLLaKG4iw6IqxlajvDnWlA3XtImW86+AOqVu9vGOhPyxQfHMJ/vv2mAAr4KEb
\r
31 S0tJutelHI8gKa4n83BWBMDHw6YpoRVEokGvo8KfVaBpoKg5KbOs/W0L3IPfSt3f6kFL
\r
32 pMPcO9TK5jb7iZ2Pi0/wAdH0KQ9V5uRjkRjl+1Qpvwda4BxOGWqGFG7fXn8JxcKqapqD
\r
33 IPE9SjmS6j2wveZdP95V9Fqh/lTGoOyBc2P7PflRQk6cUD5zrQQWNTAET02+moZsAJQq
\r
35 Received: by 10.58.172.103 with SMTP id bb7mr18743720vec.41.1351677612831;
\r
36 Wed, 31 Oct 2012 03:00:12 -0700 (PDT)
\r
37 Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])
\r
38 by mx.google.com with ESMTPS id gl6sm1699588vec.4.2012.10.31.03.00.10
\r
39 (version=SSLv3 cipher=OTHER); Wed, 31 Oct 2012 03:00:11 -0700 (PDT)
\r
40 From: Jani Nikula <jani@nikula.org>
\r
41 To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
\r
42 Subject: Re: [PATCH 2/2] emacs: Improve the regexp used to match id:'s in
\r
44 In-Reply-To: <1351650561-7331-3-git-send-email-amdragon@mit.edu>
\r
45 References: <1351650561-7331-1-git-send-email-amdragon@mit.edu>
\r
46 <1351650561-7331-3-git-send-email-amdragon@mit.edu>
\r
47 User-Agent: Notmuch/0.14+39~ge21970d (http://notmuchmail.org) Emacs/23.2.1
\r
48 (x86_64-pc-linux-gnu)
\r
49 Date: Wed, 31 Oct 2012 11:00:08 +0100
\r
50 Message-ID: <87mwz3x8pj.fsf@nikula.org>
\r
52 Content-Type: text/plain; charset=us-ascii
\r
54 ALoCoQm1mplnCkGS8LAAh6vktTKztrDNmjRPEwjwMyiUPkQD1o+n2/jpg9l5Q8o07aJ25a+Tq0o/
\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: Wed, 31 Oct 2012 10:00:17 -0000
\r
69 On Wed, 31 Oct 2012, Austin Clements <amdragon@MIT.EDU> wrote:
\r
70 > This regexp agrees with Xapian query syntax much more closely, though
\r
71 > we specifically disallow various cases that would be confusing in the
\r
72 > context of an email body (e.g., punctuation at the end of an id: link
\r
73 > is not considered part of the id: link because it's probably part of
\r
74 > the surrounding text).
\r
76 > In particular, this handles id: links that are not surrounded by
\r
77 > quotes much better, which stash is much more likely to generate now
\r
78 > that we don't quote id's that don't need to be quoted. It also
\r
79 > handles quoted id: links better.
\r
81 > We update the buttonization test to reflect the new pattern.
\r
83 Hi Austin, all of this looks good as-is, but I propose the changes below
\r
84 on top. (With the relevant comment changed too.)
\r
90 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
91 index e96e099..117eb0e 100644
\r
92 --- a/emacs/notmuch-show.el
\r
93 +++ b/emacs/notmuch-show.el
\r
94 @@ -1005,7 +1005,7 @@ message at DEPTH in the current thread."
\r
95 ;; next space or ). We disallow [.,;] as the last character
\r
96 ;; because these are probably part of the surrounding text, and not
\r
97 ;; part of the id. This doesn't match single character ids; meh.
\r
98 - "\\|[^\"[:space:])][^[:space:])]*[^[:space:]).,;]"
\r
99 + "\\|[^\"[:space:])][^[:space:])]*[^])[:space:].,:;?!]"
\r
101 "The regexp used to match id: links in messages.")
\r
103 diff --git a/test/emacs-show b/test/emacs-show
\r
104 index e16483c..e2d7c70 100755
\r
105 --- a/test/emacs-show
\r
106 +++ b/test/emacs-show
\r
107 @@ -109,7 +109,12 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-indent-thread-content-off
\r
108 test_begin_subtest "id buttonization"
\r
109 add_message '[body]="
\r
111 -id:abc.def. id:abc,def, id:abc;def;
\r
112 +id:abc.def. id:abc,def, id:abc;def; id:abc:def:
\r
113 +id:foo@bar.?baz? id:foo@bar!.baz!
\r
114 +(id:foo@bar.baz) [id:foo@bar.baz]
\r
121 @@ -131,7 +136,12 @@ To: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
122 Date: Fri, 05 Jan 2001 15:43:57 +0000
\r
125 -<<id:abc.def>>. <<id:abc,def>>, <<id:abc;def>>;
\r
126 +<<id:abc.def>>. <<id:abc,def>>, <<id:abc;def>>; <<id:abc:def>>:
\r
127 +<<id:foo@bar.?baz>>? <<id:foo@bar!.baz>>!
\r
128 +(<<id:foo@bar.baz>>) [<<id:foo@bar.baz>>]
\r
129 +<<id:foo@bar.baz>>...
\r
131 +<<id:=_-:/.[]@$%+>>
\r