From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kyle Meyer <kyle@kyleam.com>
Subject: Re: Merge 9.0.5 to emacs master?
Date: Mon, 13 Feb 2017 11:32:20 -0500
Message-ID: <87y3xaoxuz.fsf@kyleam.com>
References: <8737fmxibv.fsf@gnu.org>
	<CAFyQvY2ccxv+=2m1-Q+y7=ZyWSCqbPqzguNTPvgWOuTzC95bkQ@mail.gmail.com>
	<871sv3q8nh.fsf@kyleam.com> <871sv2wjdl.fsf@bzg.fr>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43103)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kyle@kyleam.com>) id 1cdJYD-00085h-Vv
	for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 11:32:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kyle@kyleam.com>) id 1cdJYC-0007Fu-PH
	for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 11:32:30 -0500
In-Reply-To: <871sv2wjdl.fsf@bzg.fr>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode/>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: "Emacs-orgmode"
	<emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
To: Bastien Guerry <bzg@gnu.org>
Cc: emacs-orgmode@gnu.org, Nicolas Goaziou <mail@nicolasgoaziou.fr>, Kaushal Modi <kaushal.modi@gmail.com>

Hi Bastien,

Bastien Guerry <bzg@gnu.org> writes:

> Kyle Meyer <kyle@kyleam.com> writes:
>
>> Kaushal Modi <kaushal.modi@gmail.com> writes:
>>
>>> Kyle -- Would this be a good time to start the merge to emacs master?
>>
>>>From my standpoint, that'd be fine.  I'm not aware of any outstanding
>> patches that need to be backported from the Emacs repo.
>
> Before undertaking this, we need to make sure the Emacs maintainers
> are fine with it -- I'm late in reading the related discussions.
>
> Can you wait a few days for my "go" ?

I'll do better than that and wait indefinitely since the plan isn't for
me to do the syncing :)

To give a bit more context to Kaushal's question, when he asked the list
previously [*1*] about syncing 9.0.4 with the Emacs repo, I replied
[*2*, *3*] that we should wait for the next release because there were
Emacs commits that still needed to be backported, as well as white space
touch-ups that were needed in order for the Org files to pass Emacs's
pre-commit check.

I also mentioned [*2*] that I had created a branch, emacs-sync, in the
Org repo that contains a few extra changes that I think are appropriate
for the sync.  That branch is up-to-date with 9.0.5.


[*1*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00551.html
[*2*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00571.html
[*3*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00584.html

-- 
Kyle