From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.devel Subject: Re: Dynamic loading progress Date: Sun, 08 Nov 2015 13:42:21 +0000 Message-ID: References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> <877flswse5.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a1144348aea7731052407a542 X-Trace: ger.gmane.org 1446990180 27169 80.91.229.3 (8 Nov 2015 13:43:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 8 Nov 2015 13:43:00 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 08 14:43:00 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZvQFG-0008OL-6g for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 14:42:58 +0100 Original-Received: from localhost ([::1]:47435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvQFF-0005rf-8p for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 08:42:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvQEq-0005ZI-Hb for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:42:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvQEp-00073g-AN for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:42:32 -0500 Original-Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:38860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvQEp-00073U-2L for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:42:31 -0500 Original-Received: by wmec201 with SMTP id c201so49689867wme.1 for ; Sun, 08 Nov 2015 05:42:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :content-type; bh=agN6ukKKCwFssqjaxwX5XFUDVk5f5lpbwrYllo4gFYo=; b=SD0e3AQ6Ib/g8eXA/LXrIp1WQSplPQaolCnzrlg9fqF9rTkzyJwTgSU17tW9HTZFcz wU6FmG4m68gdujEz9DyI0O8Ne3Rpnx3UdHpUtRQfEzYet9bGliI82CY+zET3EcgI0KYw GiTMbQm7ASBsHgjh8q4KsEeRq6BRcGmgiGlSKGoEEYR2VL282iSQSLkW4MZqS2Ny5EfO 304VIGMr2dQCDH7GfwNUBYi6VqUt4fyD95hBjRmCAbivqlLjZ3QucrQ2yKE4WlfQ+XFR mJcMBi67NRCw9LRMLe/cnL/Fhwto9cYgkVz1w+sSlv7zCy84IP8GudxWXMHMwmcpOkqm j04g== X-Received: by 10.28.173.194 with SMTP id w185mr21289090wme.23.1446990150528; Sun, 08 Nov 2015 05:42:30 -0800 (PST) In-Reply-To: <877flswse5.fsf@lifelogs.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c09::22d X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:193611 Archived-At: --001a1144348aea7731052407a542 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Ted Zlatanov schrieb am So., 8. Nov. 2015 um 14:08 Uhr: > On Sun, 08 Nov 2015 11:16:53 +0000 Philipp Stephani > wrote: > > PS> Aur=C3=A9lien Aptel schrieb am Sa., = 7. > Nov. > PS> 2015 um 18:47 Uhr: > > >> Well the repo is on github, dynamic-modules-2 branch. The changelog > >> might need some work and we might want to move around some files but > >> it's ready to merged in master, I think. > >> > >> https://github.com/aaptel/emacs-dynamic-module/tree/dynamic-modules-2 > >> > >> > PS> In order to produce a clean patch, I tried merging the master (from > PS> emacs-mirror) or emacs-24 branch, but both produced too many merge > PS> conflicts (even in files untouched by the module code). Which upstrea= m > PS> branch did you use to create the dynamic-modules-2 branch originally? > > Agreed. Aur=C3=A9lien, the diff is huge and there are many conflicts. It > looks like the fork from master happened in February 2015 and you're > simply out of date. Can you please rebase against the emacs.git > origin/master? Last push... > Please check https://github.com/phst/emacs-dynamic-module/tree/dynamic-modules-2, it should have the current master merged in. Unfortunately I can't test that right now because for some reason make is incredibly slow on my machine after the merge. --001a1144348aea7731052407a542 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


Ted Zl= atanov <tzz@lifelogs.com> sch= rieb am So., 8. Nov. 2015 um 14:08=C2=A0Uhr:
On Sun, 08 Nov 2015 11:16:53 +0000 Philipp Stephani <p.stephani2@gmail.com> wrote:

PS> Aur=C3=A9lien Aptel <aurelien.aptel+emacs@gmail.com> schrieb am= Sa., 7. Nov.
PS> 2015 um 18:47 Uhr:

>> Well the repo is on github, dynamic-modules-2 branch. The changelo= g
>> might need some work and we might want to move around some files b= ut
>> it's ready to merged in master, I think.
>>
>> https://github.com/aap= tel/emacs-dynamic-module/tree/dynamic-modules-2
>>
>>
PS> In order to produce a clean patch, I tried merging the master (from<= br> PS> emacs-mirror) or emacs-24 branch, but both produced too many merge PS> conflicts (even in files untouched by the module code). Which upstre= am
PS> branch did you use to create the dynamic-modules-2 branch originally= ?

Agreed. Aur=C3=A9lien, the diff is huge and there are many conflicts. It looks like the fork from master happened in February 2015 and you're simply out of date. Can you please rebase against the emacs.git
origin/master?=C2=A0 Last push...

Please check https://github.com/phst/= emacs-dynamic-module/tree/dynamic-modules-2, it should have the current= master merged in.
Unfortunately I can't test that right now = because for some reason make is incredibly slow on my machine after the mer= ge.=C2=A0
--001a1144348aea7731052407a542--