From: Tomi Ollila <tomi.ollila@iki.fi>
To: Karl Fogel <kfogel@red-bean.com>, David Bremner <david@tethera.net>
Cc: notmuch@notmuchmail.org
Subject: Re: [PATCH] emacs: add missing paren to fix defun in notmuch-address.el.
Date: Mon, 08 Apr 2013 11:16:43 +0300 [thread overview]
Message-ID: <m2ppy5v3mc.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <877gkeau42.fsf@floss.red-bean.com>
On Mon, Apr 08 2013, Karl Fogel <kfogel@red-bean.com> wrote:
> David Bremner <david@tethera.net> writes:
>>Karl Fogel <kfogel@red-bean.com> 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
next prev parent reply other threads:[~2013-04-08 8:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-06 18:33 [PATCH] emacs: add missing paren to fix defun in notmuch-address.el Karl Fogel
2013-04-07 13:52 ` David Bremner
2013-04-07 21:50 ` Karl Fogel
2013-04-08 8:16 ` Tomi Ollila [this message]
2013-04-08 8:40 ` Jani Nikula
2013-04-08 10:50 ` David Bremner
2013-04-09 1:12 ` Jed Brown
2013-04-09 6:32 ` Tomi Ollila
2013-04-09 11:50 ` David Bremner
2013-04-09 12:12 ` Tomi Ollila
2014-07-04 0:38 ` Sebastian Lipp
2014-07-04 0:56 ` Karl Fogel
2014-07-04 9:25 ` Sebastian Lipp
2014-07-05 18:18 ` Karl Fogel
2014-07-06 20:41 ` Sebastian Lipp
2014-07-07 17:35 ` Karl Fogel
2014-07-06 20:37 ` Sebastian Lipp
2014-07-07 17:40 ` Karl Fogel
2014-07-08 8:56 ` Tomi Ollila
2014-07-08 17:59 ` Karl Fogel
2014-07-04 16:31 ` Tomi Ollila
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2ppy5v3mc.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=david@tethera.net \
--cc=kfogel@red-bean.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).