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

diff --git a/d2/f541f03c2afbe45bdddff8dec7a968212543df b/d2/f541f03c2afbe45bdddff8dec7a968212543df
new file mode 100644 (file)
index 0000000..25efe75
--- /dev/null
+++ b/d2/f541f03c2afbe45bdddff8dec7a968212543df
@@ -0,0 +1,111 @@
+Return-Path: <kfogel@gmail.com>\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 AD0C3431FB6\r
+       for <notmuch@notmuchmail.org>; Sun,  7 Apr 2013 14:50:12 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.699\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 GMThlSfXQYaR for <notmuch@notmuchmail.org>;\r
+       Sun,  7 Apr 2013 14:50:11 -0700 (PDT)\r
+Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com\r
+       [209.85.212.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2D25C431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  7 Apr 2013 14:50:11 -0700 (PDT)\r
+Received: by mail-vb0-f54.google.com with SMTP id w16so3330523vbf.13\r
+       for <notmuch@notmuchmail.org>; Sun, 07 Apr 2013 14:50:10 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=x-received:sender:from:to:cc:subject:references:reply-to:date\r
+       :in-reply-to:message-id:user-agent:mime-version:content-type;\r
+       bh=ad9uILkCvu9Beu+g8Yt3KRi0bsbZFfhGfEYHI7qgzEY=;\r
+       b=DQJA2XBoX5iXJZQdQK/v/cdlWMP2twrT3VeqJ5WsOLuaCLNxRmTAC5DJSaFyuRmSWt\r
+       duqxIO+I1cm/SeXeP+PsTeOPyrejBlz2fwwGsrSQQnBpuYs31v9x5Epshh8MOUksJctr\r
+       rLYwwJDBM6HxQ3zppgeS4qOiUq9RiWU1pFMMdGqm9xWo6h0inztu2vNZHin2yP9f2xua\r
+       HtAHlzLroltaM0GSm2exHOERNYvZ2IccQPjbGqMOq2KLRXl3Jh3EAhrVUDeP4CxmI2AY\r
+       UFdlf626tb2M/syySJqO77U3So1wJU7XA6rpPVR33uE5Co4qRz5IV39l2FOUSgrT9hhk\r
+       SV2g==\r
+X-Received: by 10.52.26.17 with SMTP id h17mr11777762vdg.101.1365371409360;\r
+       Sun, 07 Apr 2013 14:50:09 -0700 (PDT)\r
+Received: from floss.red-bean.com ([75.93.240.169])\r
+       by mx.google.com with ESMTPS id u20sm441546vdt.10.2013.04.07.14.50.08\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 07 Apr 2013 14:50:08 -0700 (PDT)\r
+Sender: Karl Fogel <kfogel@gmail.com>\r
+From: Karl Fogel <kfogel@red-bean.com>\r
+To: David Bremner <david@tethera.net>\r
+Subject: Re: [PATCH] emacs: add missing paren to fix defun in\r
+       notmuch-address.el.\r
+References: <87wqsfik5l.fsf@floss.red-bean.com>\r
+       <87mwtah2hd.fsf@zancas.localnet>\r
+Date: Sun, 07 Apr 2013 17:50:05 -0400\r
+In-Reply-To: <87mwtah2hd.fsf@zancas.localnet> (David Bremner's message of\r
+       "Sun, 07 Apr 2013 10:52:46 -0300")\r
+Message-ID: <877gkeau42.fsf@floss.red-bean.com>\r
+User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-Mailman-Approved-At: Sun, 07 Apr 2013 23:23:45 -0700\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+Reply-To: Karl Fogel <kfogel@red-bean.com>\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: Sun, 07 Apr 2013 21:50:12 -0000\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
+-Karl\r