From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: Dynamic loading progress Date: Sun, 08 Nov 2015 08:08:18 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <877flswse5.fsf@lifelogs.com> References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1446988128 29182 80.91.229.3 (8 Nov 2015 13:08:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 8 Nov 2015 13:08:48 +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:08:35 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 1ZvPhz-000767-6z for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 14:08:35 +0100 Original-Received: from localhost ([::1]:47358 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvPhy-0008Gt-Iy for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 08:08:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvPhv-0008Gj-9z for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:08:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvPhs-0000TU-2U for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:08:31 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:60930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvPhr-0000TQ-S3 for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:08:27 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZvPhp-0006zZ-Rj for emacs-devel@gnu.org; Sun, 08 Nov 2015 14:08:26 +0100 Original-Received: from 98.229.60.157 ([98.229.60.157]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 08 Nov 2015 14:08:25 +0100 Original-Received: from tzz by 98.229.60.157 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 08 Nov 2015 14:08:25 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 23 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 98.229.60.157 X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:Qsiqw8nVZo7NstIRArR2QmD176M= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:193608 Archived-At: On Sun, 08 Nov 2015 11:16:53 +0000 Philipp Stephani wrote: PS> Aurélien 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 upstream PS> branch did you use to create the dynamic-modules-2 branch originally? Agreed. Aurélien, 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... Ted