Re: [PATCH] emacs: add missing paren to fix defun in notmuch-address.el.

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