Re: Calling Lisp from undo.c's record_* functions

[Phillip Lord]

John Wiegley <address@hidden> writes:

>>>>>> Phillip Lord <address@hidden> writes:
>
>> Just to check I have this correct, now that we have feature freeze, I should
>> merge (or rebase) to the emacs-25 branch? And, then I have to cherry pick
>> this across to master? Or the other way around? Or does it not matter?
>
> Optionally rebase against emacs-25, then merge it there. Your merge commit
> will get carried back to master in due course.


Ah, merging to master is someone elses problem. That sounds good to me.

Phil