From 217f5c4f55b0f8c0051f38af5e6827fa7a3a504b Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 8 Apr 2013 11:16:43 +0300 Subject: [PATCH] Re: [PATCH] emacs: add missing paren to fix defun in notmuch-address.el. --- c1/74bdfb9faaa23b0c00647807560643a645739f | 107 ++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 c1/74bdfb9faaa23b0c00647807560643a645739f diff --git a/c1/74bdfb9faaa23b0c00647807560643a645739f b/c1/74bdfb9faaa23b0c00647807560643a645739f new file mode 100644 index 000000000..672956dc0 --- /dev/null +++ b/c1/74bdfb9faaa23b0c00647807560643a645739f @@ -0,0 +1,107 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 76507431FB6 + for ; Mon, 8 Apr 2013 01:16:46 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ejUMhwVyTCsQ for ; + Mon, 8 Apr 2013 01:16:45 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 54C42431FAE + for ; Mon, 8 Apr 2013 01:16:45 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 09F8F100093; + Mon, 8 Apr 2013 11:16:44 +0300 (EEST) +From: Tomi Ollila +To: Karl Fogel , David Bremner +Subject: Re: [PATCH] emacs: add missing paren to fix defun in + notmuch-address.el. +In-Reply-To: <877gkeau42.fsf@floss.red-bean.com> +References: <87wqsfik5l.fsf@floss.red-bean.com> + <87mwtah2hd.fsf@zancas.localnet> + <877gkeau42.fsf@floss.red-bean.com> +User-Agent: Notmuch/0.15.2+75~gd7fa7c4 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +Cc: notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 08 Apr 2013 08:16:46 -0000 + +On Mon, Apr 08 2013, Karl Fogel wrote: + +> David Bremner writes: +>>Karl Fogel writes: +>>> This patch fixes a trivial missing-paren problem in notmuch-address.el +>>> (and reindents the following defun accordingly). I'm not subscribed +>>> to this list, so please keep me CC'd on any followups. +>> +>>Dear Karl; +>> +>>Thanks very much for the patch. +>> +>>Since the offending commit is now reverted, it would be great if +>>somebody (TM) would combine your patch with 238bf4cb09. +> +> Oh, it's trivial. The problem with 238bf4cb09 was simply that the +> function (defun) `notmuch-bbdb/snarf-headers' was missing a closing +> paren. A visible symptom of this was that the *next* defun after it, +> `notmuch-bbdb/snarf-from', was spuriously indented inward. If anyone +> had tried reindenting further, all the code below it would also have +> indented inward, making the problem more obvious. +> +> So the solution is to: +> +> 1) Re-apply the 238bf4cb09 patch +> +> 2) Add a parenthesis to the end of `notmuch-bbdb/snarf-headers', +> such that the line "(bbdb-update-records addrs t t))" becomes +> "(bbdb-update-records addrs t t)))" +> +> 3) Unindent the function `notmuch-bbdb/snarf-from' immediately below +> there, which just means pulling each line leftward two spaces +> +> 4) Commit, push, profit :-). +> +> The above recipe is, of course, equivalent to re-applying the 238bf4cb09 +> patch, then applying my patch (4c74ad313f608f0834961c63c70d1f811ef103b7) +> on top of it. I'm not sure what the gitmost way to do that is, but if +> you want I can simply submit a combined change whose commit message +> makes clear what's going on. + +The most tolerable way is to send new patch series w/ these 2 patches +that apply cleanly on top of current master (661dcf87aeb70) so that the +things that David needs to do are just to run `git am` and `make test`. + +... also, proceeding this way helps getting reviewers to the changes, +which in turn makes changes more likely to be pushed to our master +repository. + +> -Karl + +Tomi + -- 2.26.2