Ted Zlatanov <tzz@lifelogs.com> schrieb am So., 8. Nov. 2015 um 14:08 Uhr:

> On Sun, 08 Nov 2015 11:16:53 +0000 Philipp Stephani <p.stephani2@gmail.com>
> wrote:
>
> PS> Aurélien 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 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...
>

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.