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 11:16:53 +0000 Message-ID: References: <5625B166.3080104@dancol.org> <86zizdczhp.fsf@stephe-leake.org> <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a1144348ab232fa0524059d5a X-Trace: ger.gmane.org 1446981442 30947 80.91.229.3 (8 Nov 2015 11:17:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 8 Nov 2015 11:17:22 +0000 (UTC) To: =?UTF-8?Q?Aur=C3=A9lien_Aptel?= , Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 08 12:17:22 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 1ZvNyL-0001XB-Ck for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 12:17:21 +0100 Original-Received: from localhost ([::1]:46937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvNyK-0005Ja-Pb for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 06:17:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvNy8-0005JI-RH for emacs-devel@gnu.org; Sun, 08 Nov 2015 06:17:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvNy3-0002aJ-Jv for emacs-devel@gnu.org; Sun, 08 Nov 2015 06:17:08 -0500 Original-Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:37569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvNy3-0002aB-BM for emacs-devel@gnu.org; Sun, 08 Nov 2015 06:17:03 -0500 Original-Received: by wmww144 with SMTP id w144so11043379wmw.0 for ; Sun, 08 Nov 2015 03:17:02 -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=vVNB0hosmgj2w+YwAAooYvP3ByzFvluvjfWpaCwMmsQ=; b=oPCeuhZDzTTcfS+XuLLcdVkeklMmXOl+zjaouBiJ3xnRQdrhGUTH0eSOunaW+dW1tC rNlz8w71yKNZbUWlhbPOVyU8Hb/1DCHAYCOutowtMeKJ3fI9lfg1hKHS/DtNMZCWBVKd NhWMoT1ZNPEk4Ao/UfwZ/pvf+ISkydTFKUlSX/SK/B+6HfULRtoJsyjAxmniel+qwjaU tfvceeApSLeNj5bGUAGOkm5J4gmUuBnmtkNRI5eyUbeOSMEKJnhqt5YEmvCV0r3vPHzG 05XHKgTIQMQZ8byK0janYXprrLjsU6wzy7uOFfYyUl0wErQvbZoPCuGVwzT0yDJKn84X WQIQ== X-Received: by 10.28.173.194 with SMTP id w185mr20750765wme.23.1446981422689; Sun, 08 Nov 2015 03:17:02 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c09::231 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:193598 Archived-At: --001a1144348ab232fa0524059d5a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Aur=C3=A9lien Aptel schrieb am Sa., 7. Nov= . 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 > > In order to produce a clean patch, I tried merging the master (from emacs-mirror) or emacs-24 branch, but both produced too many merge conflicts (even in files untouched by the module code). Which upstream branch did you use to create the dynamic-modules-2 branch originally? --001a1144348ab232fa0524059d5a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


Aur=C3= =A9lien Aptel <aurel= ien.aptel+emacs@gmail.com> schrieb am Sa., 7. Nov. 2015 um 18:47=C2= =A0Uhr:
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


In order to produce a clean patch, I t= ried merging the master (from emacs-mirror) or emacs-24 branch, but both pr= oduced too many merge conflicts (even in files untouched by the module code= ). Which upstream branch did you use to create the dynamic-modules-2 branch= originally?
--001a1144348ab232fa0524059d5a--