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