1 Return-Path: <tomi.ollila@iki.fi>
\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 76507431FB6
\r
6 for <notmuch@notmuchmail.org>; Mon, 8 Apr 2013 01:16:46 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 ejUMhwVyTCsQ for <notmuch@notmuchmail.org>;
\r
16 Mon, 8 Apr 2013 01:16:45 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 54C42431FAE
\r
19 for <notmuch@notmuchmail.org>; Mon, 8 Apr 2013 01:16:45 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 09F8F100093;
\r
22 Mon, 8 Apr 2013 11:16:44 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: Karl Fogel <kfogel@red-bean.com>, David Bremner <david@tethera.net>
\r
25 Subject: Re: [PATCH] emacs: add missing paren to fix defun in
\r
27 In-Reply-To: <877gkeau42.fsf@floss.red-bean.com>
\r
28 References: <87wqsfik5l.fsf@floss.red-bean.com>
\r
29 <87mwtah2hd.fsf@zancas.localnet>
\r
30 <877gkeau42.fsf@floss.red-bean.com>
\r
31 User-Agent: Notmuch/0.15.2+75~gd7fa7c4 (http://notmuchmail.org) Emacs/24.3.1
\r
32 (x86_64-unknown-linux-gnu)
\r
33 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
34 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
35 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
36 Date: Mon, 08 Apr 2013 11:16:43 +0300
\r
37 Message-ID: <m2ppy5v3mc.fsf@guru.guru-group.fi>
\r
39 Content-Type: text/plain
\r
40 Cc: 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, 08 Apr 2013 08:16:46 -0000
\r
55 On Mon, Apr 08 2013, Karl Fogel <kfogel@red-bean.com> wrote:
\r
57 > David Bremner <david@tethera.net> writes:
\r
58 >>Karl Fogel <kfogel@red-bean.com> writes:
\r
59 >>> This patch fixes a trivial missing-paren problem in notmuch-address.el
\r
60 >>> (and reindents the following defun accordingly). I'm not subscribed
\r
61 >>> to this list, so please keep me CC'd on any followups.
\r
65 >>Thanks very much for the patch.
\r
67 >>Since the offending commit is now reverted, it would be great if
\r
68 >>somebody (TM) would combine your patch with 238bf4cb09.
\r
70 > Oh, it's trivial. The problem with 238bf4cb09 was simply that the
\r
71 > function (defun) `notmuch-bbdb/snarf-headers' was missing a closing
\r
72 > paren. A visible symptom of this was that the *next* defun after it,
\r
73 > `notmuch-bbdb/snarf-from', was spuriously indented inward. If anyone
\r
74 > had tried reindenting further, all the code below it would also have
\r
75 > indented inward, making the problem more obvious.
\r
77 > So the solution is to:
\r
79 > 1) Re-apply the 238bf4cb09 patch
\r
81 > 2) Add a parenthesis to the end of `notmuch-bbdb/snarf-headers',
\r
82 > such that the line "(bbdb-update-records addrs t t))" becomes
\r
83 > "(bbdb-update-records addrs t t)))"
\r
85 > 3) Unindent the function `notmuch-bbdb/snarf-from' immediately below
\r
86 > there, which just means pulling each line leftward two spaces
\r
88 > 4) Commit, push, profit :-).
\r
90 > The above recipe is, of course, equivalent to re-applying the 238bf4cb09
\r
91 > patch, then applying my patch (4c74ad313f608f0834961c63c70d1f811ef103b7)
\r
92 > on top of it. I'm not sure what the gitmost way to do that is, but if
\r
93 > you want I can simply submit a combined change whose commit message
\r
94 > makes clear what's going on.
\r
96 The most tolerable way is to send new patch series w/ these 2 patches
\r
97 that apply cleanly on top of current master (661dcf87aeb70) so that the
\r
98 things that David needs to do are just to run `git am` and `make test`.
\r
100 ... also, proceeding this way helps getting reviewers to the changes,
\r
101 which in turn makes changes more likely to be pushed to our master
\r