From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: Re: Merge 9.0.5 to emacs master? Date: Mon, 13 Feb 2017 17:58:56 +0100 Message-ID: <87r332ni27.fsf@gmx.us> References: <8737fmxibv.fsf@gnu.org> <871sv3q8nh.fsf@kyleam.com> <871sv2wjdl.fsf@bzg.fr> <87y3xaoxuz.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdJzA-0002VK-CB for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 12:00:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdJz7-0006Fg-Ar for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 12:00:20 -0500 Received: from [195.159.176.226] (port=43011 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdJz7-0006Es-3k for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 12:00:17 -0500 Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1cdJyx-0006zC-RS for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 18:00:07 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org Kyle Meyer writes: > Hi Bastien, > > Bastien Guerry writes: > >> Kyle Meyer writes: >> >>> Kaushal Modi 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 :) I also haven't caught up with all the messages about sync the "new" plans. AFAIR Eli said to go ahead in one of the early messages. > 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. I think we have discussed it before, but the best way seems to just copy the Org tree to the Emacs tree, right? Rasmus -- Summon the Mothership!